From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 4 Jan 2014 11:19:52 +0000 (+0100)
Subject: Merge branch 'docs-debugging'
X-Git-Tag: 4.7.1~4
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=31c3505cbf9a5a337f55d2043bd090ed544b8eba;p=i3%2Fi3

Merge branch 'docs-debugging'
---

31c3505cbf9a5a337f55d2043bd090ed544b8eba