From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 28 Aug 2011 15:02:17 +0000 (+0200)
Subject: Merge branch 'migrate-indention'
X-Git-Tag: 4.0.2~6
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=833e4233fc8574d4e2ed5cc822bdef5818dd17e9;p=i3%2Fi3

Merge branch 'migrate-indention'
---

833e4233fc8574d4e2ed5cc822bdef5818dd17e9