Merge branch 'MDL-33467' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 7 Jun 2012 05:33:22 +0000 (13:33 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 7 Jun 2012 05:33:22 +0000 (13:33 +0800)

Trivial merge