Merge branch 'MDL-33863' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 08:15:16 +0000 (16:15 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 08:15:16 +0000 (16:15 +0800)

Trivial merge