Merge branch 'phpng'
authorMichael Wallner <mike@php.net>
Tue, 1 Sep 2015 09:10:57 +0000 (11:10 +0200)
committerMichael Wallner <mike@php.net>
Tue, 1 Sep 2015 09:10:57 +0000 (11:10 +0200)

Trivial merge