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

Trivial merge