Merge branch 'MDL-41040-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 21 Aug 2013 05:36:02 +0000 (13:36 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 21 Aug 2013 05:36:02 +0000 (13:36 +0800)

Trivial merge