From: Anatoliy Belsky <ab@php.net>
Date: Tue, 8 May 2012 16:35:15 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~224
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c5da8e699f3321fe1065df45b218d187ea7365a9;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix bug 61713 check also that mbstring's found any internal_encoding
---

c5da8e699f3321fe1065df45b218d187ea7365a9