From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 29 Jun 2013 18:58:51 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.6~11
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=c4d44187457216693216a54f5ce95b22912ff088

Merge branch 'master' into next
---

c4d44187457216693216a54f5ce95b22912ff088