]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorFelipe Pena <felipensp@gmail.com>
Sat, 30 Nov 2013 13:41:01 +0000 (11:41 -0200)
committerFelipe Pena <felipensp@gmail.com>
Sat, 30 Nov 2013 13:41:01 +0000 (11:41 -0200)
commit52611a2c7e5d072d83803ff79fc472d023c05b04
treec52d9f5a77f55658b612e7f682a9b09ec1aea9b5
parent2e0a960e97e76a2e1791792c5ddc18a674d5ea63
parenta2f478cd945eb3344c0d2acbcdbbd10e97c1f2c3
Merge branch 'PHP-5.6'

* PHP-5.6:
  - Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined)