Merge branch 'master' of git.omp.am:/home/omp/git/conky
authorCesare Tirabassi <norsetto@ubuntu.com>
Sat, 14 Nov 2009 14:58:06 +0000 (15:58 +0100)
committerCesare Tirabassi <norsetto@ubuntu.com>
Sat, 14 Nov 2009 14:58:06 +0000 (15:58 +0100)
commite582acf1a0be45daa7181cf0ba725cf46255a38d
treee9bd2d42ead96a9432df5762eb93c55c573dfc28
parent0ee5e9935a52e116d7897c1d4b381440dcb83ae6
parent1a4c2c61e86f98d98a8c3aa05530b013221483e5
Merge branch 'master' of git.omp.am:/home/omp/git/conky