Merge branch 'MDL-51312_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 28 Sep 2015 10:51:36 +0000 (11:51 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 28 Sep 2015 10:51:36 +0000 (11:51 +0100)

Trivial merge