]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Sun, 1 Feb 2015 07:48:08 +0000 (23:48 -0800)
committerStanislav Malyshev <stas@php.net>
Sun, 1 Feb 2015 07:48:08 +0000 (23:48 -0800)
commit50703c900f3b75af2e2973dfd53c05f69cddec91
treef30b752f49b9245d9b02f5e7f5d19700570cb06f
parent87d8e9208c4af72303c5f5353f98f9e04e038047
parentc5526291cedcb6b5c48d6f13cc7481f8eea9761a
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix group name handling

Conflicts:
main/streams/plain_wrapper.c
main/streams/plain_wrapper.c