From: Frederic Massart <fred@moodle.com>
Date: Tue, 14 Aug 2012 09:53:11 +0000 (+0800)
Subject: Merge branch 'master' of github.com:FMCorz/mdk
X-Git-Tag: v0.1~43
X-Git-Url: https://git.cameron1729.xyz/?a=commitdiff_plain;h=469da1fab5d96df2223aa829019cc49ade8a66d6;p=mdk.git

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

Conflicts:
	README.md
---

469da1fab5d96df2223aa829019cc49ade8a66d6