Merge branch 'wip-mdl-41266' of https://github.com/rajeshtaneja/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 4 Mar 2014 08:59:10 +0000 (16:59 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 4 Mar 2014 08:59:10 +0000 (16:59 +0800)

Trivial merge