Merge branch 'MDL-29877_bad_grade_item' of git://github.com/andyjdavis/moodle
authorDamyon Wiese <damyon@moodle.com>
Fri, 12 Apr 2013 03:14:10 +0000 (11:14 +0800)
committerDamyon Wiese <damyon@moodle.com>
Fri, 12 Apr 2013 03:14:10 +0000 (11:14 +0800)
Conflicts:
version.php

1  2 
lib/db/upgrade.php

Simple merge