Merge branch 'wip-mdl-42594' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 31 Oct 2013 03:54:07 +0000 (11:54 +0800)
committerSam Hemelryk <sam@moodle.com>
Fri, 1 Nov 2013 00:56:58 +0000 (08:56 +0800)

Trivial merge