Merge branch 'wip-mdl-46327' of git://github.com/rajeshtaneja/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 19 Aug 2014 02:48:11 +0000 (10:48 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 19 Aug 2014 02:48:11 +0000 (10:48 +0800)

Trivial merge