From: Brenden Matthews <brenden@rty.ca>
Date: Thu, 6 Aug 2009 20:21:50 +0000 (-0600)
Subject: Merge branch 'master' of git.omp.am:/home/omp/git/conky
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=d710ea8b9d134c1b61510c400f99006f5b07c10c;p=monky

Merge branch 'master' of git.omp.am:/home/omp/git/conky

Conflicts:
	src/conky.h
---

d710ea8b9d134c1b61510c400f99006f5b07c10c