From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 11 Dec 2012 23:18:23 +0000 (+0100)
Subject: Merge branch 'next'
X-Git-Tag: 4.5~112^2~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2bf7793d4d241efca25c452b5c8a5897b2a29da3;p=i3%2Fi3

Merge branch 'next'
---

2bf7793d4d241efca25c452b5c8a5897b2a29da3