From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 17 Dec 2011 15:28:51 +0000 (+0000)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~183
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=db174234ce41c3ac317ef25d5fff323540295e9a;p=i3%2Fi3

Merge branch 'master' into next

Conflicts:
	debian/changelog
---

db174234ce41c3ac317ef25d5fff323540295e9a