Merge branch 'master' of ssh://suckless.org/gitrepos/st
authorChristoph Lohmann <20h@r-36.net>
Tue, 10 Mar 2015 20:59:41 +0000 (21:59 +0100)
committerChristoph Lohmann <20h@r-36.net>
Tue, 10 Mar 2015 20:59:41 +0000 (21:59 +0100)

Trivial merge