From: Michael Stapelberg 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/?p=i3%2Fi3;a=commitdiff_plain;h=8b55b2c24cff88aebaad1882e93ec49b9c2396af;hp=1b536d70cc3267474a97f0f0826e3ad2c36ac65a Merge branch 'fix-dump-log-errmsg' ---