Merge branch 'R_1_0'
authorMichael Wallner <mike@php.net>
Tue, 29 Sep 2015 15:11:43 +0000 (17:11 +0200)
committerMichael Wallner <mike@php.net>
Tue, 29 Sep 2015 15:11:43 +0000 (17:11 +0200)
commit260c2328b47d5dc6cacb822a31e4603310f28d5d
treebc9e1eeadbbdb367dee1ec30a61b67df22951713
parentac900495e2e232c7a2f3e9f226421a4f457ce7b9
parent24fb107f8255142e6d99682b533a5e4e5d29e292
Merge branch 'R_1_0'