Merge branch 'master' of git.omp.am:/home/omp/git/conky
authorBrenden Matthews <brenden@rty.ca>
Sun, 24 May 2009 19:48:10 +0000 (13:48 -0600)
committerBrenden Matthews <brenden@rty.ca>
Sun, 24 May 2009 19:48:10 +0000 (13:48 -0600)
commit19ca4c071a57c57f572098559e081eff0892a8bf
treee957f1581975a756aa217b91ebaa3e7e622ed54b
parent4bfd545d2f061e87737a2484a1c63b80bb562542
parent7b7d038035834ca66530eb0795a63a4c797c8caf
Merge branch 'master' of git.omp.am:/home/omp/git/conky