Merge branch 'wip-mdl-40933' of git://github.com/rajeshtaneja/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 5 Aug 2013 00:48:36 +0000 (10:48 +1000)
committerMarina Glancy <marina@moodle.com>
Mon, 5 Aug 2013 00:48:36 +0000 (10:48 +1000)

Trivial merge