From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 9 May 2012 17:47:19 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.3~231
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=2a0fb1db6931327113906d0a95c0c4fa90a377e1;hp=-c

Merge branch 'master' into next
---

2a0fb1db6931327113906d0a95c0c4fa90a377e1