Merge branch 'autocracy'
authorMichael Wallner <mike@php.net>
Tue, 17 Dec 2013 10:47:55 +0000 (11:47 +0100)
committerMichael Wallner <mike@php.net>
Tue, 17 Dec 2013 10:47:55 +0000 (11:47 +0100)

Trivial merge