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

Trivial merge