Merge branch 'PHP-5.5' into PHP-5.6

This commit is contained in:
Derick Rethans 2014-11-11 14:01:26 -03:00
commit a19d96fc58

File diff suppressed because it is too large Load diff