Merge branch 'R_2_5' [ci skip]
authorMichael Wallner <mike@php.net>
Tue, 1 Sep 2015 08:13:45 +0000 (10:13 +0200)
committerMichael Wallner <mike@php.net>
Tue, 1 Sep 2015 08:13:45 +0000 (10:13 +0200)

Trivial merge