Merge branch 'MDL-47787-master' of https://github.com/tbannister/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 30 Jun 2015 07:52:52 +0000 (09:52 +0200)
committerDan Poltawski <dan@moodle.com>
Tue, 30 Jun 2015 07:52:52 +0000 (09:52 +0200)

Trivial merge