From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 24 Dec 2011 14:37:03 +0000 (+0100)
Subject: Merge branch 'doc-fixes'
X-Git-Tag: 4.1.1~6
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=93a416ee7e435b78aac43944d9382a1ffa845b17;p=i3%2Fi3

Merge branch 'doc-fixes'
---

93a416ee7e435b78aac43944d9382a1ffa845b17