From: Anatol Belski <ab@php.net>
Date: Tue, 19 Aug 2014 05:45:28 +0000 (+0200)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: PRE_64BIT_BRANCH_MERGE~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6bb3d049e83321c9898b517274e4b060bb5281e3;p=php

Merge branch 'master' of git.php.net:php-src

# By Dmitry Stogov
# Via Dmitry Stogov
* 'master' of git.php.net:php-src:
  Fixed encoding support
---

6bb3d049e83321c9898b517274e4b060bb5281e3