From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 10 Jan 2012 22:16:57 +0000 (+0000)
Subject: Merge branch 'move-workspace-to-output' into next
X-Git-Tag: 4.2~147
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0174f1c18363d5a423d906b2863a662b41d052b9;p=i3%2Fi3

Merge branch 'move-workspace-to-output' into next
---

0174f1c18363d5a423d906b2863a662b41d052b9