From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 9 May 2012 17:47:10 +0000 (+0200)
Subject: Merge branch 'fix-dump-log-errmsg'
X-Git-Tag: 4.3~231^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8b55b2c24cff88aebaad1882e93ec49b9c2396af;p=i3%2Fi3

Merge branch 'fix-dump-log-errmsg'
---

8b55b2c24cff88aebaad1882e93ec49b9c2396af