]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Thu, 10 Jul 2014 20:35:41 +0000 (22:35 +0200)
committerAnatol Belski <ab@php.net>
Thu, 10 Jul 2014 20:35:41 +0000 (22:35 +0200)
commitefea4cc3e0f2b59dd68044f76a33e7a096453afa
treea8e20ea14765901f4b3b2dc2958f7adde871f33a
parent2f1c11b3e244de763bf12dd96633a1fa7d806bda
parent63abaa6d69236c4abf06a00fbc64908e29b7ab81
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix end of stream exception when generating makefile