merge with hg
merge
Merge branch 'master' of https://github.com/zhoujd/zzstumpwm