From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 28 May 2013 17:56:57 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.6~32
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=8353a387c99cb2d5b90bbc83bb3b41fb2a0895a1

Merge branch 'master' into next
---

8353a387c99cb2d5b90bbc83bb3b41fb2a0895a1