Merge branch 'merge-DEV_2'
authorMichael Wallner <mike@php.net>
Tue, 5 Aug 2014 16:47:19 +0000 (18:47 +0200)
committerMichael Wallner <mike@php.net>
Tue, 5 Aug 2014 16:47:19 +0000 (18:47 +0200)

Trivial merge