Merge "(bug 36839) Use mb_check_encoding() if available."
authorTim Starling <tstarling@wikimedia.org>
Thu, 31 May 2012 12:36:19 +0000 (12:36 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 31 May 2012 12:36:19 +0000 (12:36 +0000)

Trivial merge