Merge branch 'master' of git.omp.am:/home/omp/git/conky
authorCesare Tirabassi <norsetto@ubuntu.com>
Fri, 13 Nov 2009 15:36:49 +0000 (16:36 +0100)
committerCesare Tirabassi <norsetto@ubuntu.com>
Fri, 13 Nov 2009 15:36:49 +0000 (16:36 +0100)
commitf1272dbd311084c8ca1eb57226a80fabee02f904
tree184f4018218d62a3297abed519102c314902a6cf
parent363cf1ab7390a113c64390357dede0e452b91a58
parente9d92ae717c0c4dfaaa3df0ec934ed0d21b4d010
Merge branch 'master' of git.omp.am:/home/omp/git/conky