Merge branch 'R_2_0'
authorMichael Wallner <mike@php.net>
Thu, 17 Apr 2014 10:25:57 +0000 (12:25 +0200)
committerMichael Wallner <mike@php.net>
Thu, 17 Apr 2014 10:25:57 +0000 (12:25 +0200)

Trivial merge