From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 11 Nov 2011 22:49:20 +0000 (+0000)
Subject: Merge branch 'next'
X-Git-Tag: 4.1.1~36
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0adbffb38621192c416ac52aa6b82ac57fb6394d;p=i3%2Fi3

Merge branch 'next'
---

0adbffb38621192c416ac52aa6b82ac57fb6394d