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

Trivial merge