From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 21 Jan 2012 11:50:22 +0000 (+0000)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~129
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8d72a77c7a56fa788d29a54455c806f18e2a3fd5;p=i3%2Fi3

Merge branch 'master' into next

Conflicts:
	src/handlers.c
---

8d72a77c7a56fa788d29a54455c806f18e2a3fd5