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

Merge branch 'master' into next
---

8247f44e95b0eb7a1932bb151a34dd34cdd436cf