Merge branch 'wip-mdl-31941' of git://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 May 2012 06:26:29 +0000 (14:26 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 14 May 2012 06:26:29 +0000 (14:26 +0800)

Trivial merge