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

Trivial merge