Merge branch 'wip-mdl-27309' of git://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 16 Oct 2012 06:59:04 +0000 (14:59 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 16 Oct 2012 06:59:04 +0000 (14:59 +0800)

Trivial merge