From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 26 Aug 2011 01:24:14 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~192
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=53a9ace3a6e44213dc5b390df02de8be3d5d16de;p=i3%2Fi3

Merge branch 'master' into next
---

53a9ace3a6e44213dc5b390df02de8be3d5d16de