From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 30 Nov 2011 20:34:54 +0000 (+0000)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~205
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=6c112f2a9a5de4c3ef06d4cbce2bd7b22c0caa1d

Merge branch 'master' into next
---

6c112f2a9a5de4c3ef06d4cbce2bd7b22c0caa1d