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)
commit77dd442ab94b4b261f8d9769cae79c56016cb8bd
treef6ad8b46d3e6625b486ec94b441c0a65d693b84d
parent47df95c362f17e6518cd9385c6b32ba1051c5167
parent63354ab50d5ecd97228a609a24c0a3bb4b915bcc
Merge branch 'MDL-29877_bad_grade_item' of git://github.com/andyjdavis/moodle

Conflicts:
version.php
lib/db/upgrade.php