Merge branch 'MDL-42666-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 7 Nov 2013 03:44:01 +0000 (11:44 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 7 Nov 2013 03:44:01 +0000 (11:44 +0800)

Trivial merge