From: marco 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=d5d74890e7cc1f89bb7a1b1c4c43fb146e7a93a8;p=spectrwm.git Merge branch 'master' of ssh://opensource.conformal.com/git/scrotwm ---