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

Merge branch 'master' into next
---

fabcd7d911de216573848872f6c6574c6353b32b