Merge branch 'MDL-49949-master' of git://github.com/mastnym/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 May 2015 14:32:56 +0000 (15:32 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 18 May 2015 14:32:56 +0000 (15:32 +0100)

Trivial merge