Merge branch 'MDL-42743' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 8 Nov 2013 08:08:20 +0000 (16:08 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 8 Nov 2013 08:08:20 +0000 (16:08 +0800)

Trivial merge