Merge branch 'master' of github.com:sabetts/stumpwm
Merge branch 'master' of github.com:robgssp/stumpwm