Merge branch 'wip-mdl-33102' of git://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 May 2012 08:10:59 +0000 (16:10 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 29 May 2012 08:10:59 +0000 (16:10 +0800)

Trivial merge