Merge branch '1.8.0' of git.omp.am:/home/omp/git/conky into 1.8.0
authorCesare Tirabassi <norsetto@ubuntu.com>
Sat, 13 Mar 2010 18:29:17 +0000 (19:29 +0100)
committerCesare Tirabassi <norsetto@ubuntu.com>
Sat, 13 Mar 2010 18:29:17 +0000 (19:29 +0100)
commitb93fced933bab8c351ee62f761e1ced70553ff9d
tree0f43db43aefd5b10561942d74692e18f8ee053db
parent1fe99bc578106379bc642dd47daee081f9db563f
parent323e360e6f16dd91d317fd18c61b726d3293d090
Merge branch '1.8.0' of git.omp.am:/home/omp/git/conky into 1.8.0