From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 1 Mar 2015 15:50:37 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/ton/i3 into ton-master
X-Git-Tag: 4.9.1~8^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3c5df50c54ab6451098c2175a21470312952000e;p=i3%2Fi3

Merge branch 'master' of https://github.com/ton/i3 into ton-master
---

3c5df50c54ab6451098c2175a21470312952000e