From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 19 Oct 2011 17:29:32 +0000 (+0200)
Subject: Merge remote-tracking branch 'stevee/docbook-manpages'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c4dff1b71465acafb67ced75361e28830148194;p=ipfire-3.x.git

Merge remote-tracking branch 'stevee/docbook-manpages'
---

2c4dff1b71465acafb67ced75361e28830148194