Merge branch 'wip-mdl-46817' of git://github.com/rajeshtaneja/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 19 Aug 2014 06:03:27 +0000 (14:03 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 19 Aug 2014 06:03:27 +0000 (14:03 +0800)

Trivial merge