Merge branch 'MDL-49844-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 16 Apr 2015 12:45:20 +0000 (13:45 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Apr 2015 12:45:20 +0000 (13:45 +0100)

Trivial merge