Merge branch 'master' of git.omp.am:/home/omp/git/conky
[monky] / LICENSE.GPL
2007-08-10 Brenden Matthewsclarifying licensing