Merge branch 'wip-mdl-39955' of git://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 13 Aug 2013 02:13:13 +0000 (14:13 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 13 Aug 2013 02:13:13 +0000 (14:13 +1200)

Trivial merge