Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky
authorNikolas Garofil <garo@dunaldi.garofil.be>
Wed, 29 Jul 2009 19:27:19 +0000 (21:27 +0200)
committerNikolas Garofil <garo@dunaldi.garofil.be>
Wed, 29 Jul 2009 19:27:19 +0000 (21:27 +0200)
commit8f3150d8f66df15038e1c5015a98910701a1908b
treeeaaeadba8e7d1cd38c7bf717dc5a9bc2cf378978
parent9ad3b9d8bc2aa2c3e629e7668e7f141283c9abae
parent7bfff20e5df71a1fdabd8d50f553c8a59384316e
Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky