From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 20 Jan 2012 18:14:34 +0000 (+0000)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~136
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=57bf93ebaf025e610970841908611512e03a1a1d;p=i3%2Fi3

Merge branch 'master' into next
---

57bf93ebaf025e610970841908611512e03a1a1d