Merge branch 'master' of git://nwl.cc/~n0-1/conky