Merge branch 'more-config-types'
authorMichael Wallner <mike@php.net>
Mon, 18 Jan 2016 12:34:20 +0000 (13:34 +0100)
committerMichael Wallner <mike@php.net>
Mon, 18 Jan 2016 12:34:20 +0000 (13:34 +0100)
commit39831a9cf4a4aa9f126bc9a949f03ae232e3794b
tree14055615925f340b2ec5beda3f6491cbd9f2cc2c
parent97f82f7b1698c69d603a02e5e52d3c0c109fd68e
parent772c1e688a51b32331fae7993429b3a03d766d8d
Merge branch 'more-config-types'