Merge branch 'master' of github.com:FMCorz/mdk
authorFrederic Massart <fred@moodle.com>
Wed, 10 Jun 2015 02:16:45 +0000 (10:16 +0800)
committerFrederic Massart <fred@moodle.com>
Wed, 10 Jun 2015 02:16:45 +0000 (10:16 +0800)

Trivial merge