Merge branch 'wip-mdl-42261' of git://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 25 Oct 2013 03:33:19 +0000 (11:33 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 25 Oct 2013 03:33:19 +0000 (11:33 +0800)

Trivial merge