Merge branch 'MDL-47614-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Oct 2014 17:47:30 +0000 (18:47 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Oct 2014 17:47:30 +0000 (18:47 +0100)

Trivial merge