From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 12 Mar 2013 13:05:47 +0000 (+0100)
Subject: Merge branch 'next'
X-Git-Tag: 4.5.1~5
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=a1691a08ba33bba654d45e80afab0dcf03cc0cfa

Merge branch 'next'
---

a1691a08ba33bba654d45e80afab0dcf03cc0cfa