From: Pierre Joye <pierre.php@gmail.com>
Date: Tue, 9 Apr 2013 05:05:03 +0000 (+0200)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=396b1109cff60de187f7d5dbb89d35a4189b088e;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  ws and comment for recommended aa method
---

396b1109cff60de187f7d5dbb89d35a4189b088e