Merge branch 'MDL-45074-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 15 Apr 2014 03:38:01 +0000 (11:38 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Apr 2014 03:38:01 +0000 (11:38 +0800)

Trivial merge