Merge branch 'MDL-29877_bad_grade_item_23' of git://github.com/andyjdavis/moodle...
authorDamyon Wiese <damyon@moodle.com>
Fri, 12 Apr 2013 03:37:48 +0000 (11:37 +0800)
committerDamyon Wiese <damyon@moodle.com>
Fri, 12 Apr 2013 03:37:48 +0000 (11:37 +0800)
commitd3b880b578e56a599830665b85342bc91891fb8a
tree6da108f279601358fd8c0c3e4b9746e78edc1fff
parent7bfe54c41c39f89ec1309d6ede6df7dc849130e4
parentaeacefdb197a5c471310d2c7c2c5e73419f8cc5b
Merge branch 'MDL-29877_bad_grade_item_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

Conflicts:
version.php