From: marco <marco@conformal.com>
Date: Fri, 18 Nov 2011 01:55:41 +0000 (-0600)
Subject: Merge branch 'master' of ssh://opensource.conformal.com/git/scrotwm
X-Git-Url: https://jasonwoof.com/gitweb/?a=commitdiff_plain;ds=sidebyside;h=82e158a61fc38c602d1860d69ec260f51a4e1f87;p=spectrwm.git

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

82e158a61fc38c602d1860d69ec260f51a4e1f87