Merge branch 'MDL-47556' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 9 Oct 2014 09:54:19 +0000 (10:54 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 9 Oct 2014 09:54:19 +0000 (10:54 +0100)

Trivial merge