Merge branch 'master' of git.omp.am:/home/omp/git/conky
authorCesare Tirabassi <norsetto@ubuntu.com>
Sat, 18 Jul 2009 04:42:25 +0000 (06:42 +0200)
committerCesare Tirabassi <norsetto@ubuntu.com>
Sat, 18 Jul 2009 04:42:25 +0000 (06:42 +0200)
commit25fcd618d4144272b10a2cbaa69784e0e2522e06
treedd61bfd6e2c2348be2ac361234eed864938b3f02
parentd9cb0954416c0ddfb171f83da6c31232e4e1cf7c
parent85deafa50050750d04c05a9343f5b4e4f882d893
Merge branch 'master' of git.omp.am:/home/omp/git/conky