]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Tue, 28 Apr 2015 12:38:21 +0000 (14:38 +0200)
committerAnatol Belski <ab@php.net>
Tue, 28 Apr 2015 12:38:21 +0000 (14:38 +0200)
commit768bbedf8233dad6c1709b536f8db20d4496a7cc
treee8023661d5ebe33e227d0b096942af4ebd651a0e
parent4cabbf9781405d1075c770f5e28279aba537f1e3
parent9c5c3ff0220f689954ada24b94228b6f3591e37d
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix VC9 build with PCRE