From: Marco Peereboom <marco@conformal.com>
Date: Tue, 25 Oct 2011 20:20:18 +0000 (-0500)
Subject: Merge branch 'master' of opensource.conformal.com:/git/scrotwm
X-Git-Url: https://jasonwoof.com/gitweb/?a=commitdiff_plain;h=163f135835a874fde60008254cea4a1f753ddc64;p=spectrwm.git

Merge branch 'master' of opensource.conformal.com:/git/scrotwm
---

163f135835a874fde60008254cea4a1f753ddc64