Merge branch 'MDL-37426-m' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Jan 2013 04:41:12 +0000 (12:41 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Jan 2013 04:41:12 +0000 (12:41 +0800)

Trivial merge