Merge remote-tracking branch 'alfh/bugfix_htmlclean' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 19 Feb 2014 19:49:38 +0000 (20:49 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 19 Feb 2014 19:49:38 +0000 (20:49 +0100)

Trivial merge