Merge branch 'MDL-44784-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 Apr 2014 04:12:01 +0000 (12:12 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Apr 2014 04:12:01 +0000 (12:12 +0800)

Trivial merge