]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Fri, 6 Feb 2015 10:44:22 +0000 (13:44 +0300)
committerDmitry Stogov <dmitry@zend.com>
Fri, 6 Feb 2015 10:44:22 +0000 (13:44 +0300)
* 'master' of git.php.net:php-src:
  Upgrade pcre to 8.36


Trivial merge