From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 23 Apr 2013 05:18:39 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.6~43
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0f6b5fe8dafe0a7f903d84b1f1f9e6689bddfc1e;p=i3%2Fi3

Merge branch 'master' into next
---

0f6b5fe8dafe0a7f903d84b1f1f9e6689bddfc1e