From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 7 Apr 2013 08:00:42 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.6~55
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bb22e232ad2e2ae6289e907ece0afe5c66faa23c;p=i3%2Fi3

Merge branch 'master' into next
---

bb22e232ad2e2ae6289e907ece0afe5c66faa23c