From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 21 Mar 2012 21:30:08 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~46
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d4523de6c8f7d930d52ce69d94ff186a29c5e803;p=i3%2Fi3

Merge branch 'master' into next
---

d4523de6c8f7d930d52ce69d94ff186a29c5e803