From: Michael Wallner <mike@php.net>
Date: Wed, 20 Nov 2013 14:47:34 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=2fca266f370219830d9f66df171cbac3a460676a;p=mdref%2Fmdref

Merge remote-tracking branch 'origin/master'
---

2fca266f370219830d9f66df171cbac3a460676a