From: Frederic Massart <fred@moodle.com>
Date: Wed, 2 Apr 2014 02:38:16 +0000 (+0800)
Subject: Merge branch 'master' of github.com:FMCorz/mdk
X-Git-Tag: v1.1~16
X-Git-Url: https://git.cameron1729.xyz/?a=commitdiff_plain;h=bf693290131550b47cbbc42d610f66cf17093421;p=mdk.git

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

bf693290131550b47cbbc42d610f66cf17093421