Merge branch 'v1.1.x'
authorMichael Wallner <mike@php.net>
Wed, 30 Sep 2015 12:54:08 +0000 (14:54 +0200)
committerMichael Wallner <mike@php.net>
Wed, 30 Sep 2015 12:54:08 +0000 (14:54 +0200)

Trivial merge