From: martin f. krafft <madduck@madduck.net>
Date: Sat, 5 Sep 2009 10:31:59 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.madduck.net/~/git/pub/etc/xsession into xkb
X-Git-Url: https://git.madduck.net/etc/xsession.git/commitdiff_plain/9fb497738f6dbcdc8e0cbacf194200ab1e3d62b1?ds=sidebyside;hp=-c

Merge branch 'master' of ssh://git.madduck.net/~/git/pub/etc/xsession into xkb

Conflicts:
	.xmodmap
---

9fb497738f6dbcdc8e0cbacf194200ab1e3d62b1