Merge branch 'master' of github.com:FMCorz/mdk
authorFrederic Massart <fred@moodle.com>
Mon, 21 Jul 2014 01:53:32 +0000 (09:53 +0800)
committerFrederic Massart <fred@moodle.com>
Mon, 21 Jul 2014 01:53:32 +0000 (09:53 +0800)

Trivial merge