Merge branch 'master' of git.omp.am:/home/omp/git/conky
authorCesare Tirabassi <norsetto@ubuntu.com>
Wed, 29 Jul 2009 16:04:57 +0000 (18:04 +0200)
committerCesare Tirabassi <norsetto@ubuntu.com>
Wed, 29 Jul 2009 16:04:57 +0000 (18:04 +0200)
commit7bfff20e5df71a1fdabd8d50f553c8a59384316e
tree5668402d24496d5a8da7c4df143b1f395238d91e
parent580fa3a52dcbb9e2a2d8c518ba472d05a1152250
parent51c928a8ef589c722c8342769a491556c25d67c4
Merge branch 'master' of git.omp.am:/home/omp/git/conky