From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 21 Sep 2015 08:10:45 +0000 (+0200)
Subject: Merge branch 'hwangcc23-debuglog-on-persist' into next
X-Git-Tag: 4.11~12
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b0c72abcdbe9b1d91e04d87fef52d21dc298ec64;p=i3%2Fi3

Merge branch 'hwangcc23-debuglog-on-persist' into next

fixes #1929
---

b0c72abcdbe9b1d91e04d87fef52d21dc298ec64