From: Christopher Jones <sixd@php.net>
Date: Fri, 13 Sep 2013 23:44:10 +0000 (-0700)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: PRE_PHPNG_MERGE~222^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c4df19187aa36fab03275e62f29a5ccf8b6d2631;p=php

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

# By Nikita Popov
# Via Nikita Popov
* 'master' of https://git.php.net/repository/php-src:
  Fix intl build
---

c4df19187aa36fab03275e62f29a5ccf8b6d2631