Merge branch 'MDL-33119' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 6 Jun 2012 02:31:12 +0000 (10:31 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 6 Jun 2012 02:31:12 +0000 (10:31 +0800)

Trivial merge