Merge branch 'wip-mdl-30904' of git://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 3 Apr 2012 03:39:14 +0000 (11:39 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 3 Apr 2012 03:39:14 +0000 (11:39 +0800)

Trivial merge