Merge branch 'callbacks'
authorMichael Wallner <mike@php.net>
Fri, 12 Feb 2016 15:01:07 +0000 (16:01 +0100)
committerMichael Wallner <mike@php.net>
Fri, 12 Feb 2016 15:01:07 +0000 (16:01 +0100)

Trivial merge