From: marco <marco@conformal.com>
Date: Tue, 1 Nov 2011 15:22:26 +0000 (-0500)
Subject: Merge branch 'master' of ssh://opensource.conformal.com/git/scrotwm
X-Git-Url: https://jasonwoof.com/gitweb/?a=commitdiff_plain;h=8d058c8d347f35ddfb1e236b6fd6880308f20f2e;hp=492641ac10c48893204dee0f9b24b34d2a857f84;p=spectrwm.git

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