From: Cesare Tirabassi Date: Sat, 18 Jul 2009 04:42:25 +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=25fcd618d4144272b10a2cbaa69784e0e2522e06;p=monky Merge branch 'master' of git.omp.am:/home/omp/git/conky --- 25fcd618d4144272b10a2cbaa69784e0e2522e06