Merge branch 'MDL-45048-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 Apr 2014 02:01:11 +0000 (10:01 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 14 Apr 2014 02:01:11 +0000 (10:01 +0800)

Trivial merge