Merge branch 'MDL-42209_master' of https://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 15 Oct 2013 06:43:02 +0000 (14:43 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Oct 2013 06:43:02 +0000 (14:43 +0800)

Trivial merge