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

Merge branch 'master' into next

Conflicts:
	src/handlers.c
---

fd8e1c98c91c86300904ae85dd22657dcb291bf5