From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 6 Mar 2016 15:17:27 +0000 (+0100)
Subject: Merge branch 'release-4.12'
X-Git-Tag: 4.13~117
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0a601a23d6af79fab5438ad79861d3563cc32434;p=i3%2Fi3

Merge branch 'release-4.12'
---

0a601a23d6af79fab5438ad79861d3563cc32434