From: Felipe Pena <felipensp@gmail.com>
Date: Wed, 1 Jan 2014 11:56:49 +0000 (-0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~58
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=37897e258d13016f80c61b7d6e9054994f2e5e0f;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  - Fixed bug #66381 (__ss_family was changed on AIX 5.3)
---

37897e258d13016f80c61b7d6e9054994f2e5e0f