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

Merge branch 'testsuite' into next
---

bf105e1d7db16231233cac29a4347a24509ac61c