From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 23 Nov 2011 00:04:53 +0000 (+0000)
Subject: Merge branch 'testsuite' into next
X-Git-Tag: 4.2~226
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d0d804ba698aae41bd74f6c7c42654ac04713a7e;p=i3%2Fi3

Merge branch 'testsuite' into next
---

d0d804ba698aae41bd74f6c7c42654ac04713a7e