Merge branch 'MDL-46370_master' of https://github.com/moodlerooms/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Jul 2014 08:54:56 +0000 (09:54 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Jul 2014 08:54:56 +0000 (09:54 +0100)

Trivial merge