Merge branch 'master' of git.omp.am:/home/omp/git/conky
authorCesare Tirabassi <norsetto@ubuntu.com>
Sat, 11 Jul 2009 19:37:54 +0000 (21:37 +0200)
committerCesare Tirabassi <norsetto@ubuntu.com>
Sat, 11 Jul 2009 19:37:54 +0000 (21:37 +0200)
commit4211ac30db847eb773ac0ca0f41fe9ca3f15f0ef
tree38e05a4e1bf5c9b16320030a7e9ac6fa5e21b6b3
parent88ae603cf57afdb450c87d1da440f2bb88fe64a8
parent931019aad9a1f7ba4c457e723d282c3d52af129a
Merge branch 'master' of git.omp.am:/home/omp/git/conky