Merge branch 'MDL-40010_master' of https://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 11 Jun 2013 05:05:25 +0000 (13:05 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 11 Jun 2013 05:05:25 +0000 (13:05 +0800)

Trivial merge