From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 3 Aug 2011 01:33:31 +0000 (+0200)
Subject: Merge branch 'workspace-startup-order' into next
X-Git-Tag: 4.0.2~65^2~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=dfbed047c8f53e967f16659d7a7e2ca02b9e5f08;p=i3%2Fi3

Merge branch 'workspace-startup-order' into next
---

dfbed047c8f53e967f16659d7a7e2ca02b9e5f08