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

Merge branch 'master' into next
---

b9e6d37efb3ae3c55305ee334fd2b0fa7dec14df