Merge branch 'MDL-40282' of github.com:colchambers/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 2 Jul 2013 07:15:04 +0000 (15:15 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 2 Jul 2013 07:15:04 +0000 (15:15 +0800)

Trivial merge