]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Mon, 14 Apr 2014 00:03:28 +0000 (17:03 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 14 Apr 2014 00:03:28 +0000 (17:03 -0700)
commitdf8e34bcc133bec10daa01dee3c2eb0fe59bb4bb
tree785385483ab41f7baa118a49f1d73c6da2769616
parent733b09442d40ae2803ca1ffd073a74ca4a8ebb07
parent3a2660b30254def0fdf7f955d89ac6ee331d5045
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix windows build