Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky
authorNikolas Garofil <garo@dunaldi.garofil.be>
Sun, 7 Jun 2009 09:41:29 +0000 (11:41 +0200)
committerNikolas Garofil <garo@dunaldi.garofil.be>
Sun, 7 Jun 2009 09:41:29 +0000 (11:41 +0200)
commitbcbeb402c0ad4c1d8deb6f26b007a669389e4f26
treeeb97a8592e31f187f176423bef42f8c2f67cee58
parent06c0dbf8b4a7d7fa219aaaf51b24af6359c93df5
parenta9c8ae4145aaf86faa783c2c4f18aa0427118603
Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky