Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky
authorNikolas Garofil <garo@dunaldi.garofil.be>
Fri, 24 Jul 2009 09:12:35 +0000 (11:12 +0200)
committerNikolas Garofil <garo@dunaldi.garofil.be>
Fri, 24 Jul 2009 09:12:35 +0000 (11:12 +0200)
commit3322b2a9a9a575b7538730903aade7a7e8775f03
treeb1e33ceaecdc835b07c67e952942ab283ac817e2
parentfeedc8e7faa0187e4d00593558ae3cd467f9e35b
parentb2a30ea47878ca335a603dff14c87a01a168770e
Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky