Merge branch 'master' of github.com:FMCorz/mdk
authorFrederic Massart <fred@moodle.com>
Thu, 9 Apr 2015 02:28:36 +0000 (10:28 +0800)
committerFrederic Massart <fred@moodle.com>
Thu, 9 Apr 2015 02:28:36 +0000 (10:28 +0800)

Trivial merge