From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 7 Feb 2012 22:42:41 +0000 (-0500)
Subject: Merge branch 'fix-split'
X-Git-Tag: 4.2~88^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1ddde16895f0eb8c4723d9609baa6011781a27ec;p=i3%2Fi3

Merge branch 'fix-split'
---

1ddde16895f0eb8c4723d9609baa6011781a27ec