From: Frederic Massart <fred@moodle.com>
Date: Wed, 16 Dec 2015 06:32:35 +0000 (+0800)
Subject: Merge branch 'master' of github.com:FMCorz/mdk
X-Git-Tag: v1.5.4~6
X-Git-Url: https://git.cameron1729.xyz/?a=commitdiff_plain;h=61e4185a549780ceee3925aa0cfa86ab9ba4675f;p=mdk.git

Merge branch 'master' of github.com:FMCorz/mdk
---

61e4185a549780ceee3925aa0cfa86ab9ba4675f