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

Merge branch 'master' into next
---

65e5bcfdf4c44845dadf057a6bde1f15db3381ff