From: Michael Wallner <mike@php.net>
Date: Tue, 17 Dec 2013 10:47:55 +0000 (+0100)
Subject: Merge branch 'autocracy'
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=f38828a34ee165669db60ac17a4befaf91c05119;hp=77a226ecc32112a4a34118548837cb178707b900;p=mdref%2Fmdref

Merge branch 'autocracy'
---