Merge branch 'MDL-41211-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Aug 2013 08:44:09 +0000 (16:44 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Aug 2013 08:44:09 +0000 (16:44 +0800)

Trivial merge