Merge branch 'master' of git.omp.am:/home/omp/git/conky
[monky] / lua /
2009-07-10 Brenden MatthewsA whole bunch of changes, mostly Lua related.