Merge branch 'MDL-45362-master' of https://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 2 May 2014 02:59:29 +0000 (10:59 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 2 May 2014 02:59:29 +0000 (10:59 +0800)

Trivial merge