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

Trivial merge