Merge branch 'wip-mdl-40218' of git://github.com/rajeshtaneja/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 9 Jul 2013 23:58:09 +0000 (09:58 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 9 Jul 2013 23:58:09 +0000 (09:58 +1000)
1  2 
lib/testing/generator/data_generator.php
mod/assign/gradingoptionsform.php
mod/assign/gradingtable.php
mod/assign/locallib.php
mod/assign/tests/locallib_test.php

Simple merge
Simple merge
Simple merge
Simple merge