Merge branch 'wip-mdl-45073' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 15 Apr 2014 03:57:51 +0000 (11:57 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Apr 2014 03:57:51 +0000 (11:57 +0800)

Trivial merge