From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 7 Mar 2015 14:57:13 +0000 (+0100)
Subject: Merge branch 'fix-restore-errormsg'
X-Git-Tag: 4.9.1~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5fb99ad9f70ec7bd19576a682a6bed8239a90312;p=i3%2Fi3

Merge branch 'fix-restore-errormsg'
---

5fb99ad9f70ec7bd19576a682a6bed8239a90312