Merge branch 'master' into gh-pages
authorMichael Wallner <mike@php.net>
Thu, 5 Dec 2013 08:38:28 +0000 (09:38 +0100)
committerMichael Wallner <mike@php.net>
Thu, 5 Dec 2013 08:38:28 +0000 (09:38 +0100)

Trivial merge