Merge branch 'MDL-29877_bad_grade_item_24' of git://github.com/andyjdavis/moodle...
commitd4a997b7d7a902c2df0565fa548c73f068e735ee
authorDamyon Wiese <damyon@moodle.com>
Fri, 12 Apr 2013 03:36:17 +0000 (12 11:36 +0800)
committerDamyon Wiese <damyon@moodle.com>
Fri, 12 Apr 2013 03:36:17 +0000 (12 11:36 +0800)
tree857caed4c1ae2da78bad168436418b296cfb54bd
parent7ec3994f784b123a06f6720080ede13d6506ef3c
parent166102e9b3b808311063584cc4ebd4b3f4070e90
Merge branch 'MDL-29877_bad_grade_item_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE

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