From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 17 Aug 2011 14:13:11 +0000 (+0200)
Subject: Merge branch 'move-output' into next
X-Git-Tag: 4.1~215
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1779719b809cb2d37c41a56d008f0fce00f2aa14;p=i3%2Fi3

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

1779719b809cb2d37c41a56d008f0fce00f2aa14