Merge branch 'MDL-40006' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 22 Sep 2014 10:55:47 +0000 (11:55 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 22 Sep 2014 10:55:47 +0000 (11:55 +0100)

Trivial merge