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

Trivial merge