Merge branch 'master' of github.com:FMCorz/mdk
authorFrederic Massart <fred@moodle.com>
Wed, 10 Dec 2014 03:31:51 +0000 (11:31 +0800)
committerFrederic Massart <fred@moodle.com>
Wed, 10 Dec 2014 03:31:51 +0000 (11:31 +0800)

Trivial merge