From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 11 Aug 2009 10:40:11 +0000 (+0200)
Subject: Merge branch 'next' into testcases
X-Git-Tag: 3.d~133
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=34c6748c5fa718c7a022c85ac84528141ea51a12;p=i3%2Fi3

Merge branch 'next' into testcases
---

34c6748c5fa718c7a022c85ac84528141ea51a12