Merge branch 'MDL-49306-master' of git://github.com/gurgus/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 15 Apr 2015 11:35:36 +0000 (12:35 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 15 Apr 2015 11:35:36 +0000 (12:35 +0100)

Trivial merge