Merge branch 'MDL-43731' of https://github.com/ramdesh/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Jun 2015 13:56:52 +0000 (14:56 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Jun 2015 13:56:52 +0000 (14:56 +0100)

Trivial merge