Merge branch 'master' of github.com:FMCorz/mdk
authorFrederic Massart <fred@moodle.com>
Wed, 16 Dec 2015 06:32:35 +0000 (14:32 +0800)
committerFrederic Massart <fred@moodle.com>
Wed, 16 Dec 2015 06:32:35 +0000 (14:32 +0800)

Trivial merge