From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 4 Sep 2012 20:49:16 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.3~43
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2a37089ad109efd4c5fd8d1b4c32f60b8fc82978;p=i3%2Fi3

Merge branch 'master' into next
---

2a37089ad109efd4c5fd8d1b4c32f60b8fc82978