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

Merge branch 'master' into next
---

70d28bc7afb013de718969371d3a3671de4a9bfc