From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 8 Jan 2012 16:33:48 +0000 (+0000)
Subject: Merge branch 'workspace_on_output' into next
X-Git-Tag: 4.2~148
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9c11ef4b231f30d1db1fe0eaa8168e45115991b6;p=i3%2Fi3

Merge branch 'workspace_on_output' into next
---

9c11ef4b231f30d1db1fe0eaa8168e45115991b6