From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 7 Mar 2015 14:57:41 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.10.1~75
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0148dc6fd30a41b7005ccdf6cda921b34c1ac592;p=i3%2Fi3

Merge branch 'master' into next

Conflicts:
	src/commands.c
---

0148dc6fd30a41b7005ccdf6cda921b34c1ac592