]> granicus.if.org Git - php/commit
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)
commitca33ae3eb2e8e547ee3c7d2360700e225a17d81b
treea5df1279442c220ad3c296b2d2a0e7c3521179d9
parent991b2cc37be58501c34139ca650a3b5ba1804cce
parentcc7194dd10f9822d882d1cbd259d4208ccc82671
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #69689 (Align PCRE_MINOR with current version)