Merge branch 'wip-mdl-43048' of https://github.com/rajeshtaneja/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 3 Dec 2013 03:43:32 +0000 (11:43 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 3 Dec 2013 03:43:32 +0000 (11:43 +0800)

Trivial merge