Merge branch 'parser-httpd'
authorStefan Schantl <stefan.schantl@ipfire.org>
Fri, 19 Feb 2016 06:38:38 +0000 (07:38 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Fri, 19 Feb 2016 06:38:38 +0000 (07:38 +0100)

Trivial merge