Merge branch 'R_2_0'
authorMichael Wallner <mike@php.net>
Fri, 17 Jan 2014 15:08:09 +0000 (16:08 +0100)
committerMichael Wallner <mike@php.net>
Fri, 17 Jan 2014 15:08:09 +0000 (16:08 +0100)

Trivial merge