Merge branch 'master' of github.com:FMCorz/mdk
authorFrederic Massart <fred@moodle.com>
Tue, 14 Aug 2012 09:53:11 +0000 (17:53 +0800)
committerFrederic Massart <fred@moodle.com>
Tue, 14 Aug 2012 09:53:11 +0000 (17:53 +0800)
Conflicts:
README.md


Trivial merge