Merge branch 'MDL-42201_master' of https://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Oct 2013 02:25:44 +0000 (10:25 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Oct 2013 02:25:44 +0000 (10:25 +0800)

Trivial merge