Merge branch 'wip-mdl-46987' of https://github.com/rajeshtaneja/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 8 Oct 2014 14:00:20 +0000 (22:00 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 8 Oct 2014 14:00:20 +0000 (22:00 +0800)

Trivial merge