Merge branch 'MDL-37599' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Jan 2013 03:40:04 +0000 (11:40 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Jan 2013 03:40:04 +0000 (11:40 +0800)

Trivial merge