Merge branch 'MDL-50270-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Jul 2015 07:57:30 +0000 (08:57 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Jul 2015 07:57:30 +0000 (08:57 +0100)

Trivial merge