From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 10 Jun 2012 16:08:23 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.3~210
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c008f3f9289292d267aa5bca62c2a8f130c3caf8;p=i3%2Fi3

Merge branch 'master' into next
---

c008f3f9289292d267aa5bca62c2a8f130c3caf8