]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Mon, 14 Apr 2014 00:04:00 +0000 (17:04 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 14 Apr 2014 00:04:00 +0000 (17:04 -0700)
commit04a11b850a17103d5a508932c768d423fbf6d870
tree78653754d804adb2164416ef4a99a6fbcbabae7b
parentd3c4292db7b905b7ff4f2d95ab2ecf0337a78ccc
parentdf8e34bcc133bec10daa01dee3c2eb0fe59bb4bb
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix windows build