From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 12 Feb 2012 11:03:07 +0000 (+0100)
Subject: Merge remote-tracking branch 'stevee/asciidoc'
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dfd822c249a91d3247600c6e425e9f8553a0c44b;p=ipfire-3.x.git

Merge remote-tracking branch 'stevee/asciidoc'
---

dfd822c249a91d3247600c6e425e9f8553a0c44b