From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 10 Feb 2012 00:03:18 +0000 (+0000)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~86
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2daa8d422ae63d55e4b952070e8e894c0963618f;p=i3%2Fi3

Merge branch 'master' into next

Conflicts:
	i3-config-wizard/main.c
---

2daa8d422ae63d55e4b952070e8e894c0963618f