Merge branch 'MDL-42232' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 Oct 2013 06:24:02 +0000 (14:24 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 14 Oct 2013 06:24:02 +0000 (14:24 +0800)

Trivial merge