Merge branch 'master' of git.omp.am:/home/omp/git/conky
authorCesare Tirabassi <norsetto@ubuntu.com>
Sun, 26 Jul 2009 11:04:11 +0000 (13:04 +0200)
committerCesare Tirabassi <norsetto@ubuntu.com>
Sun, 26 Jul 2009 11:04:11 +0000 (13:04 +0200)
commitffe5d5f104cc6675475e2c3d1d49cc667a1e28d9
tree3387d83258425ef382f3cf1832a9d5b6537b0d47
parent94cd289aec8915b7e99d2e46911883866fc3a510
parentb963c2827fe5491e7073de4e829ac6686f148d8f
Merge branch 'master' of git.omp.am:/home/omp/git/conky