Merge branch 'R_2_0'
authorMichael Wallner <mike@php.net>
Thu, 10 Jul 2014 12:30:16 +0000 (14:30 +0200)
committerMichael Wallner <mike@php.net>
Thu, 10 Jul 2014 12:30:16 +0000 (14:30 +0200)

Trivial merge