From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 17 Sep 2011 13:13:05 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~158
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7a38d8ac56b61e9582af8eb5d0449fc89a795c71;p=i3%2Fi3

Merge branch 'master' into next
---

7a38d8ac56b61e9582af8eb5d0449fc89a795c71