From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 20 Dec 2011 18:44:26 +0000 (+0000)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~174
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=622b94f176c3a6959c13ca2162be673c7b8028c4

Merge branch 'master' into next
---

622b94f176c3a6959c13ca2162be673c7b8028c4