fix cainfo default configuration; fix array_merge
authorMichael Wallner <mike@php.net>
Wed, 21 Jan 2015 20:56:56 +0000 (21:56 +0100)
committerMichael Wallner <mike@php.net>
Wed, 21 Jan 2015 20:56:56 +0000 (21:56 +0100)

No differences found