Merge remote-tracking branch 'origin/master'
authorMichael Wallner <mike@php.net>
Wed, 20 Nov 2013 14:47:34 +0000 (15:47 +0100)
committerMichael Wallner <mike@php.net>
Wed, 20 Nov 2013 14:47:34 +0000 (15:47 +0100)

Trivial merge