Merge branch 'MDL-41230-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 9 Oct 2013 03:16:34 +0000 (11:16 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 9 Oct 2013 03:16:34 +0000 (11:16 +0800)

Trivial merge