From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 26 Nov 2011 22:18:01 +0000 (+0000)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~216
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=f5dce848b83cd8fbe5e9d0905acc058924bf2101

Merge branch 'master' into next
---

f5dce848b83cd8fbe5e9d0905acc058924bf2101