Merge branch 'wip-mdl-33607' of git://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 Jun 2012 06:34:35 +0000 (14:34 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Jun 2012 06:34:35 +0000 (14:34 +0800)

Trivial merge