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

Merge branch 'next'
---

0f276fdefa5428a9137996bd2d36ae24d86b80df