merge raphf branch
authorMichael Wallner <mike@php.net>
Sun, 3 Feb 2013 22:03:06 +0000 (22:03 +0000)
committerMichael Wallner <mike@php.net>
Sun, 3 Feb 2013 22:03:06 +0000 (22:03 +0000)

Trivial merge