Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky
authorNikolas Garofil <garo@dunaldi.garofil.be>
Sun, 19 Jul 2009 21:34:31 +0000 (23:34 +0200)
committerNikolas Garofil <garo@dunaldi.garofil.be>
Sun, 19 Jul 2009 21:34:31 +0000 (23:34 +0200)
commitf245aff685c44d765dac88d90735e18430848dca
treedaa9dfed6981aec999af7ab65c9230ca403426ef
parentafdda377297e9ffd38c4ef344f8338c88c9fc3f1
parent80a71ea8bd7da0dc352f7ef7261a2e59f5c747e4
Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky