From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 22 Dec 2012 13:08:14 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.5~100
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=a1ccca22e6b6170eb281e2f248f5043e0d2dca1b

Merge branch 'master' into next
---

a1ccca22e6b6170eb281e2f248f5043e0d2dca1b