[hackers] [st] Merge branch 'master' of ssh://suckless.org/gitrepos/st || Christoph Lohmann

[git]

commit c87d45466bac0812101f3b0036a669cd3f72ab6b
Merge: 28259f5 adeb2e9
Author: Christoph Lohmann <2...@r-36.net>
Date:   Tue Mar 10 21:59:41 2015 +0100

    Merge branch 'master' of ssh://suckless.org/gitrepos/st