Merge branch 'wip-mdl-41415' of git://github.com/rajeshtaneja/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 27 Aug 2013 08:06:32 +0000 (16:06 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 27 Aug 2013 08:06:32 +0000 (16:06 +0800)

Trivial merge