Merge branch 'wip-mdl-38155' of git://github.com/rajeshtaneja/moodle
authorMarina Glancy <marina@moodle.com>
Thu, 10 Oct 2013 00:23:06 +0000 (11:23 +1100)
committerMarina Glancy <marina@moodle.com>
Thu, 10 Oct 2013 00:23:06 +0000 (11:23 +1100)

Trivial merge