From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 15 Mar 2013 18:27:23 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.6~78
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f5a43738d1847fb3fbdf489230c2de7e7b503d54;p=i3%2Fi3

Merge branch 'master' into next
---

f5a43738d1847fb3fbdf489230c2de7e7b503d54