Merge branch 'MDL-44980-master-v2' of git://github.com/jamiepratt/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 11 Apr 2014 04:55:15 +0000 (12:55 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 11 Apr 2014 04:55:15 +0000 (12:55 +0800)

Trivial merge