Merge branch 'PHP-5.6'

This commit is contained in:
Derick Rethans 2014-06-13 23:26:50 +01:00
commit b1a708b28c

File diff suppressed because it is too large Load Diff