From: Cesare Tirabassi Date: Sun, 12 Jul 2009 19:18:28 +0000 (+0200) Subject: Merge branch 'master' of git.omp.am:/home/omp/git/conky X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=d3f1e6288cdf2b33f80788aa4f37657ce4be922c;p=monky Merge branch 'master' of git.omp.am:/home/omp/git/conky --- d3f1e6288cdf2b33f80788aa4f37657ce4be922c