From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 24 Dec 2013 09:37:14 +0000 (+0100)
Subject: Merge branch 'dpi-log'
X-Git-Tag: 4.7.1~6
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cd6fb699773d43be0926699dd81179be2fd5f0ef;p=i3%2Fi3

Merge branch 'dpi-log'
---

cd6fb699773d43be0926699dd81179be2fd5f0ef