From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 25 Jan 2013 12:56:26 +0000 (+0100)
Subject: Merge branch 'fix-workspace-ws'
X-Git-Tag: 4.5~46^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8f4456a14a0eb2b6750c3cad643baab018136395;p=i3%2Fi3

Merge branch 'fix-workspace-ws'
---

8f4456a14a0eb2b6750c3cad643baab018136395