Merge branch 'MDL-44981-master' of git://github.com/jamiepratt/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 11 Apr 2014 05:01:38 +0000 (13:01 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 11 Apr 2014 05:01:38 +0000 (13:01 +0800)

Trivial merge