From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 29 Jun 2013 18:28:07 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.6~12
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=78e99440f6ff144bb6842f3fb33c1f65faadc4df;p=i3%2Fi3

Merge branch 'master' into next
---

78e99440f6ff144bb6842f3fb33c1f65faadc4df