From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 19 Sep 2012 16:12:41 +0000 (+0200)
Subject: Merge branch 'next'
X-Git-Tag: 4.4~155^2~1
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=9c3ece56d20db392610ae3106d570ee47c5831e8

Merge branch 'next'
---

9c3ece56d20db392610ae3106d570ee47c5831e8