Merge branch 'MDL-33485' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 5 Jun 2012 02:16:44 +0000 (10:16 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 5 Jun 2012 02:16:44 +0000 (10:16 +0800)

Trivial merge