Merge branch 'MDL-47564-master' of https://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 16 Oct 2014 10:50:38 +0000 (11:50 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Oct 2014 10:50:38 +0000 (11:50 +0100)

Trivial merge