]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorFelipe Pena <felipensp@gmail.com>
Sat, 30 Nov 2013 13:40:42 +0000 (11:40 -0200)
committerFelipe Pena <felipensp@gmail.com>
Sat, 30 Nov 2013 13:40:42 +0000 (11:40 -0200)
commita2f478cd945eb3344c0d2acbcdbbd10e97c1f2c3
treedb83d7b5df4ea00521a47c81497e04d8396649a3
parent2e6d8305907feec5fd971fd62d982112f5151ce2
parent78f69a2b4f368058e9798c7ef1f733e783bfd220
Merge branch 'PHP-5.5' into PHP-5.6

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