Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
This commit is contained in:
Felipe Pena 2015-02-17 01:08:48 -02:00
commit f6e9ed76ae

Diff content is not available