From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 17 Mar 2013 00:01:11 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.6~76
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=41ac26456beed6e8911b3d2fa152186a8a7100b3

Merge branch 'master' into next
---

41ac26456beed6e8911b3d2fa152186a8a7100b3