Merge branch 'wip-mdl-41590' of git://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 10 Sep 2013 20:45:22 +0000 (08:45 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 10 Sep 2013 20:45:22 +0000 (08:45 +1200)

Trivial merge