From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 24 Sep 2011 19:10:21 +0000 (+0100)
Subject: Merge branch 'testsuite' into next
X-Git-Tag: 4.1~139
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=efec744747b0ddfda1bbcc4ce614d9b32a0f28dc;p=i3%2Fi3

Merge branch 'testsuite' into next
---

efec744747b0ddfda1bbcc4ce614d9b32a0f28dc