From: Michael Wallner <mike@php.net>
Date: Mon, 18 Jan 2016 12:34:20 +0000 (+0100)
Subject: Merge branch 'more-config-types'
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;ds=sidebyside;h=39831a9cf4a4aa9f126bc9a949f03ae232e3794b;hp=39831a9cf4a4aa9f126bc9a949f03ae232e3794b;p=m6w6%2Fext-psi

Merge branch 'more-config-types'
---