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

Merge branch 'master' into next
---

5a345db18bc92e23a54db16840412cd74b618d1d