From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 5 Oct 2011 23:08:06 +0000 (+0100)
Subject: Merge branch 'testsuite' into next
X-Git-Tag: 4.1~121
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1688ab475ac218878d7807effdf4b44e905161ba;p=i3%2Fi3

Merge branch 'testsuite' into next
---

1688ab475ac218878d7807effdf4b44e905161ba