Merge branch 'wip-mdl-43521' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Jan 2014 03:08:23 +0000 (11:08 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Jan 2014 03:08:23 +0000 (11:08 +0800)

Trivial merge