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

Trivial merge