Merge branch 'MDL-47972' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 30 Oct 2014 17:31:12 +0000 (17:31 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 30 Oct 2014 17:31:12 +0000 (17:31 +0000)

Trivial merge