Merge branch 'MDL-47400-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Oct 2014 17:12:38 +0000 (18:12 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Oct 2014 17:12:38 +0000 (18:12 +0100)

Trivial merge