]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorLior Kaplan <kaplanlior@gmail.com>
Thu, 18 Jun 2015 14:34:53 +0000 (17:34 +0300)
committerLior Kaplan <kaplanlior@gmail.com>
Thu, 18 Jun 2015 14:34:53 +0000 (17:34 +0300)
* PHP-5.4:
  Fixed bug #69689 (Align PCRE_MINOR with current version)


Trivial merge