Merge branch 'wip-mdl-40042' of git://github.com/rajeshtaneja/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 21 Aug 2013 00:02:41 +0000 (10:02 +1000)
committerMarina Glancy <marina@moodle.com>
Wed, 21 Aug 2013 00:02:41 +0000 (10:02 +1000)

Trivial merge