From: Penny Leach <penny@mjollnir.org>
Date: Wed, 3 Aug 2011 19:00:19 +0000 (+0200)
Subject: Merge remote branch 'origin/master' into lysander
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=refs%2Fheads%2Flysander;p=dotfiles%2Fxdefaults.git

Merge remote branch 'origin/master' into lysander

Conflicts:
	.Xdefaults
---

046f3edf7df5d8e4f109857bf9adb51f5e587131