Merge branch 'wip-mdl-32155' of git://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 23 May 2012 05:28:01 +0000 (13:28 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 23 May 2012 05:28:01 +0000 (13:28 +0800)

Trivial merge