Merge branch 'jira-dev' of git://github.com/damyon/mdk into jira
authorFrederic Massart <fred@moodle.com>
Mon, 18 Feb 2013 02:07:07 +0000 (10:07 +0800)
committerFrederic Massart <fred@moodle.com>
Mon, 18 Feb 2013 02:07:07 +0000 (10:07 +0800)

Trivial merge