Merge branch 'v1.0.x'
authorMichael Wallner <mike@php.net>
Wed, 30 Sep 2015 10:21:17 +0000 (12:21 +0200)
committerMichael Wallner <mike@php.net>
Wed, 30 Sep 2015 10:21:17 +0000 (12:21 +0200)
commit0ef55616b66a3f554d89142944a9f684f3e78d65
treec88d1627c2d3e652e1a6e5536b58f89091fe2a52
parentd06440394c6b84fe00ae597b48210aea2abbce82
parent0a8356afc91009b1c28472d781a4fbb01f00629e
Merge branch 'v1.0.x'