Merge pull request #2169 from MikePetullo/php5
authorJo-Philipp Wich <[email protected]>
Mon, 28 Dec 2015 15:26:52 +0000 (16:26 +0100)
committerJo-Philipp Wich <[email protected]>
Mon, 28 Dec 2015 15:26:52 +0000 (16:26 +0100)
commit08d8c7f60b69d644f3cbde72a62027bde5261bac
tree6e0f46f1c6cf0fde4bb83b9a7420df4f15ce94b5
parent83ad5a92337365425fb3a04408b8289d38625746
parent766cfcc77f3be9152e818dc5703204b607a5a405
Merge pull request #2169 from MikePetullo/php5

Cherry pick PHP5 updates into for-15.05.