Merge branch 'MDL-49493-master' of git://github.com/mastnym/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 May 2015 11:00:44 +0000 (12:00 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 25 May 2015 11:00:44 +0000 (12:00 +0100)

Trivial merge