Merge branch 'wip-mdl-32526' of git://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Jan 2013 06:00:26 +0000 (14:00 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Jan 2013 06:00:26 +0000 (14:00 +0800)

Trivial merge