From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 27 Aug 2011 11:47:51 +0000 (+0200)
Subject: Merge branch 'fix-dock-reconfigure'
X-Git-Tag: 4.0.2~12
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9e46f7bd8f762c2928e50b88d2cd81ba5a6c56c4;p=i3%2Fi3

Merge branch 'fix-dock-reconfigure'
---

9e46f7bd8f762c2928e50b88d2cd81ba5a6c56c4