Merge branch 'wip-mdl-30833' of git://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 19 Sep 2012 01:52:10 +0000 (09:52 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 19 Sep 2012 01:52:10 +0000 (09:52 +0800)

Trivial merge