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

Trivial merge