Merge branch 'MDL-45550-master' of https://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 May 2014 01:30:19 +0000 (09:30 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 May 2014 01:30:19 +0000 (09:30 +0800)

Trivial merge