From: Cesare Tirabassi Date: Sun, 12 Jul 2009 16:46:07 +0000 (+0200) Subject: Merge branch 'master' of git.omp.am:/home/omp/git/conky X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=14c30feaeacf3c00e59f0ee92577a5e2ce48f8c1;p=monky Merge branch 'master' of git.omp.am:/home/omp/git/conky --- 14c30feaeacf3c00e59f0ee92577a5e2ce48f8c1