Merge branch 'R_2_0'
authorMichael Wallner <mike@php.net>
Thu, 10 Jul 2014 11:10:28 +0000 (13:10 +0200)
committerMichael Wallner <mike@php.net>
Thu, 10 Jul 2014 11:10:28 +0000 (13:10 +0200)

Trivial merge