Merge branch 'MDL-49606-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 31 Mar 2015 12:59:05 +0000 (13:59 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 31 Mar 2015 12:59:05 +0000 (13:59 +0100)

Trivial merge