Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky