Merge branch 'master' of git.omp.am:/home/omp/git/conky
authorBrenden Matthews <brenden@rty.ca>
Sat, 1 Aug 2009 21:01:09 +0000 (15:01 -0600)
committerBrenden Matthews <brenden@rty.ca>
Sat, 1 Aug 2009 21:01:09 +0000 (15:01 -0600)
commitf5c134712306d80455181267693dd660f640d507
tree6259f702b53ef8e616dc74cd33bdfb139a57ca6b
parent47b28690289cb75ef0200ce248637126b2bcb716
parent945da94b954de4ac06532bbd80385806b78f3ecf
Merge branch 'master' of git.omp.am:/home/omp/git/conky