From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 1 Aug 2011 21:18:53 +0000 (+0200)
Subject: Merge branch 'next'
X-Git-Tag: 4.0.2~74
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d6480be215971410f728ab4f855744f4cbd19def;p=i3%2Fi3

Merge branch 'next'
---

d6480be215971410f728ab4f855744f4cbd19def