Merge branch 'R_2_0'
authorMichael Wallner <mike@php.net>
Thu, 24 Apr 2014 09:17:14 +0000 (11:17 +0200)
committerMichael Wallner <mike@php.net>
Thu, 24 Apr 2014 09:17:14 +0000 (11:17 +0200)

Trivial merge