From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 31 Jan 2015 21:56:08 +0000 (+0100)
Subject: Merge branch 'placeholder'
X-Git-Tag: 4.9~14^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=20dc3271a73adae6f6d9f160d29caec28a3693d0;p=i3%2Fi3

Merge branch 'placeholder'
---

20dc3271a73adae6f6d9f160d29caec28a3693d0