Merge branch 'wip-mdl-42222' of git://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 9 Oct 2013 09:23:44 +0000 (17:23 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 9 Oct 2013 09:23:44 +0000 (17:23 +0800)

Trivial merge