From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 21 Aug 2009 09:45:59 +0000 (+0200)
Subject: Merge branch 'next' into testcases
X-Git-Tag: 3.d~131
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4da54f12797fac971054d94da7de81208b36a69f;p=i3%2Fi3

Merge branch 'next' into testcases

Conflicts:
	docs/userguide
---

4da54f12797fac971054d94da7de81208b36a69f