Merge branch 'MDL-45059-master' of https://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 02:30:12 +0000 (10:30 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 02:30:12 +0000 (10:30 +0800)

Trivial merge