Merge branch 'R_2_0'
authorMichael Wallner <mike@php.net>
Wed, 9 Jul 2014 15:52:13 +0000 (17:52 +0200)
committerMichael Wallner <mike@php.net>
Wed, 9 Jul 2014 15:52:13 +0000 (17:52 +0200)
commit9959c7864a5bcbe5e698f23f6cf51bf9abf06b7d
treecb5b89aaee4fe12f64bade1613428e40a1567c2c
parent5e30ba54d44779779ed6bc4b45ea9ccf005490ce
parentd5f6bd4ac008f03076dd910b60fd0964158823c8
Merge branch 'R_2_0'

Conflicts:
tests/params001.phpt
tests/params003.phpt
tests/params004.phpt
tests/params005.phpt
tests/params001.phpt
tests/params013.phpt
tests/params014.phpt
tests/params015.phpt