Merge branch 'MDL-49796-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Jul 2015 12:01:18 +0000 (13:01 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Jul 2015 12:01:18 +0000 (13:01 +0100)

Trivial merge