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

Trivial merge