Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky
authorNikolas Garofil <garo@dunaldi.garofil.be>
Sat, 21 Nov 2009 14:50:35 +0000 (15:50 +0100)
committerNikolas Garofil <garo@dunaldi.garofil.be>
Sat, 21 Nov 2009 14:50:35 +0000 (15:50 +0100)
commit20a7f5eb72651715c746a72780e5f509673670f9
tree0e5c1fcc1fdc06e157db98ae688457d8adf441c4
parent567a86f99a094ab7228462aa71c5fd7f8e54918f
parentd7f9e64824f6231d21598b54568ea670b8b45968
Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky