From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 28 Aug 2011 18:18:03 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~174
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=a4804a53b8ecf5e5f7d6ee9266cd8d9501e090df

Merge branch 'master' into next
---

a4804a53b8ecf5e5f7d6ee9266cd8d9501e090df