Merge branch 'MDL-49973-master' of git://github.com/cameron1729/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Sep 2015 08:44:44 +0000 (09:44 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Sep 2015 08:44:44 +0000 (09:44 +0100)

Trivial merge