Merge branch 'master' of github.com:FMCorz/mdk
authorFrederic Massart <fred@moodle.com>
Fri, 8 Nov 2013 06:48:29 +0000 (14:48 +0800)
committerFrederic Massart <fred@moodle.com>
Fri, 8 Nov 2013 06:48:29 +0000 (14:48 +0800)

Trivial merge