Merge branch 'MDL-51855-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 26 Oct 2015 10:20:02 +0000 (10:20 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 26 Oct 2015 10:20:02 +0000 (10:20 +0000)

Trivial merge