From: Cesare Tirabassi Date: Sat, 11 Jul 2009 19:37:54 +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=4211ac30db847eb773ac0ca0f41fe9ca3f15f0ef;p=monky Merge branch 'master' of git.omp.am:/home/omp/git/conky --- 4211ac30db847eb773ac0ca0f41fe9ca3f15f0ef