Merge branch 'master' of git.omp.am:/home/omp/git/conky
authorCesare Tirabassi <norsetto@ubuntu.com>
Fri, 24 Jul 2009 09:32:02 +0000 (11:32 +0200)
committerCesare Tirabassi <norsetto@ubuntu.com>
Fri, 24 Jul 2009 09:32:02 +0000 (11:32 +0200)
commit0081fcab604214a5f91b918541b5eb6df7ceff1d
tree23c30f8078aed18efeec84851de049fecdb766ea
parentf5c896451042f84f30ad2ae3794be2bd34f881f5
parent3322b2a9a9a575b7538730903aade7a7e8775f03
Merge branch 'master' of git.omp.am:/home/omp/git/conky