Merge branch 'MDL-42150-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 Oct 2013 05:25:12 +0000 (13:25 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Oct 2013 05:25:12 +0000 (13:25 +0800)

Trivial merge