Merge branch 'R_2_0'
authorMichael Wallner <mike@php.net>
Tue, 22 Apr 2014 10:18:44 +0000 (12:18 +0200)
committerMichael Wallner <mike@php.net>
Tue, 22 Apr 2014 10:18:44 +0000 (12:18 +0200)

Trivial merge