Merge branch 'wip-mdl-40917' of https://github.com/rajeshtaneja/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 21 Jan 2014 02:41:40 +0000 (10:41 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 21 Jan 2014 02:41:40 +0000 (10:41 +0800)

Trivial merge