Merge branch 'MDL-33911' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 21 Jun 2012 08:00:08 +0000 (16:00 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 21 Jun 2012 08:00:08 +0000 (16:00 +0800)

Trivial merge