From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 22 Nov 2013 16:09:28 +0000 (+0100)
Subject: Merge branch 'fix-urgent-crash'
X-Git-Tag: 4.7~17^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fd07f989fdf441ef335245dd3436a70ff60e8896;p=i3%2Fi3

Merge branch 'fix-urgent-crash'
---

fd07f989fdf441ef335245dd3436a70ff60e8896