]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorFelipe Pena <felipensp@gmail.com>
Wed, 1 Jan 2014 11:56:49 +0000 (09:56 -0200)
committerFelipe Pena <felipensp@gmail.com>
Wed, 1 Jan 2014 11:56:49 +0000 (09:56 -0200)
* PHP-5.5:
  - Fixed bug #66381 (__ss_family was changed on AIX 5.3)


Trivial merge