From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 31 Jul 2011 22:52:32 +0000 (+0200)
Subject: Merge branch 'next'
X-Git-Tag: 4.0.2~75
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=eeb44e3703c5468686d25c975706a4743d614181;p=i3%2Fi3

Merge branch 'next'
---

eeb44e3703c5468686d25c975706a4743d614181