Merge branch 'MDL-36571' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 06:59:34 +0000 (14:59 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 06:59:34 +0000 (14:59 +0800)

Trivial merge