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

Trivial merge