Merge branch 'wip-mdl-33664' of git://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 13 Jun 2012 02:07:32 +0000 (10:07 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 13 Jun 2012 02:07:32 +0000 (10:07 +0800)

Trivial merge