Merge branch 'master' of git://nwl.cc/~n0-1/conky
authorBrenden Matthews <brenden@rty.ca>
Sun, 14 Dec 2008 03:04:22 +0000 (20:04 -0700)
committerBrenden Matthews <brenden@rty.ca>
Sun, 14 Dec 2008 03:04:22 +0000 (20:04 -0700)
commit9cd8dcd2c3bc1c879a7568e958b4cb6c47a641b1
treed7243f1f9c51aa4ade573d5ad790590f5def553a
parent77506c0e80772045b853931fe250434fb88ab047
parent1f3d7d1cd22082b591ad0345c5aa219fd27cab00
Merge branch 'master' of git://nwl.cc/~n0-1/conky