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

Merge branch 'master' into next
---

6f8b2845863e9071d7d630b270729d46423c1eb5