Merge branch 'MDL-37247_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 04:50:44 +0000 (12:50 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 04:50:44 +0000 (12:50 +0800)

Trivial merge