Merge branch 'v1.0.x'
authorMichael Wallner <mike@php.net>
Wed, 30 Sep 2015 12:18:16 +0000 (14:18 +0200)
committerMichael Wallner <mike@php.net>
Wed, 30 Sep 2015 12:18:16 +0000 (14:18 +0200)
commit6bb2f2584faf986f1b0b764f69e760b69163f48c
treed233cef0f6df67e94df96a061237d9bd24945e8c
parent82a22c5890659bb20931c76b94198a949447f1ea
parentce1db4cbb0eed74f3ef5736ee1855961ce35f0f8
Merge branch 'v1.0.x'