From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 4 Oct 2011 22:39:59 +0000 (+0100)
Subject: Merge branch 'testsuite' into next
X-Git-Tag: 4.1~122
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cef2eb9e9a6712605e3cc438e1bc051c1a0e629b;p=i3%2Fi3

Merge branch 'testsuite' into next
---

cef2eb9e9a6712605e3cc438e1bc051c1a0e629b