Merge branch 'MDL-43312-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 8 May 2014 02:51:51 +0000 (10:51 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 8 May 2014 02:51:51 +0000 (10:51 +0800)

Trivial merge