Merge branch '1.8.0' of git.omp.am:/home/omp/git/conky into 1.8.0
authorCesare Tirabassi <norsetto@ubuntu.com>
Sat, 30 Jan 2010 18:24:19 +0000 (19:24 +0100)
committerCesare Tirabassi <norsetto@ubuntu.com>
Sat, 30 Jan 2010 18:24:19 +0000 (19:24 +0100)
commit9601693afa581277a41242b863802cacdf642b36
tree62a03c1f48dfda13b527d7ffee3142e71e2b65d8
parentd620ac6f0f075253857ed3203db2d7c89df629e9
parentfcc6524db2e5e197567451970568f248a8c2f7b2
Merge branch '1.8.0' of git.omp.am:/home/omp/git/conky into 1.8.0