Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky
authorNikolas Garofil <garo@dunaldi.garofil.be>
Sun, 8 Nov 2009 19:30:50 +0000 (20:30 +0100)
committerNikolas Garofil <garo@dunaldi.garofil.be>
Sun, 8 Nov 2009 19:30:50 +0000 (20:30 +0100)
commit3e4a2cf74e835c94190a7152532280d1c40b350b
treef6cb59b49c917e949c232cf7c216fc04062ade43
parent52ec7d2d51d80150421f73febd80f5d6da533be9
parent37071ccd8e03de74c91dad2aa59ec1717797ad4e
Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky