From: Michael Stapelberg Date: Mon, 29 Aug 2011 14:05:08 +0000 (+0200) Subject: Merge branch 'fix-userguide' X-Git-Tag: 4.1~172^2 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=69dc632a4ef93872a9e45ef1761f69a20a82e58b;p=i3%2Fi3 Merge branch 'fix-userguide' --- 69dc632a4ef93872a9e45ef1761f69a20a82e58b