Merge branch 'MDL-40060-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 Oct 2013 06:33:27 +0000 (14:33 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Oct 2013 06:33:27 +0000 (14:33 +0800)

Trivial merge