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

Merge branch 'next'
---

f48a472d46ea3aa98a7b137d1ea8fbf13fd494dd