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

Merge branch 'docs-debugging'
---

b8bf3d39eb4ef5035c6dc745db20e905341fe9dc