Merge branch 'MDL-47513-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 15:17:49 +0000 (16:17 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 15:17:49 +0000 (16:17 +0100)

Trivial merge