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

Merge branch 'master' into next
---

1a3b82eb02cc2da1078e73db24df10b89bf99260