From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 2 Apr 2013 21:59:48 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.6~57
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0b000b1464d88a067495e26130693273e85220fe;p=i3%2Fi3

Merge branch 'master' into next
---

0b000b1464d88a067495e26130693273e85220fe