Merge "Provide fallbacks for use of mb_convert_encoding() in HtmlFormatter"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 9 Sep 2015 23:51:16 +0000 (23:51 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 9 Sep 2015 23:51:16 +0000 (23:51 +0000)

Trivial merge