Merge branch 'MDL-47918-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 30 Oct 2014 14:31:38 +0000 (14:31 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 30 Oct 2014 14:31:38 +0000 (14:31 +0000)

Trivial merge