Merge branch 'MDL-41975-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 02:05:26 +0000 (10:05 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 02:05:26 +0000 (10:05 +0800)

Trivial merge