Merge branch 'MDL-45110-master' of git://github.com/jamiepratt/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 04:03:23 +0000 (12:03 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 04:03:23 +0000 (12:03 +0800)

Trivial merge