Merge branch 'MDL-45338-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 6 May 2014 03:27:41 +0000 (11:27 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 6 May 2014 03:27:41 +0000 (11:27 +0800)

Trivial merge