Merge remote-tracking branch 'refs/remotes/origin/master'
authorMichael Wallner <mike@php.net>
Tue, 17 Dec 2013 10:50:53 +0000 (11:50 +0100)
committerMichael Wallner <mike@php.net>
Tue, 17 Dec 2013 10:50:53 +0000 (11:50 +0100)

Trivial merge