Merge branch 'WIP-MDL-35249-master' of git://github.com/nadavkav/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 7 Nov 2012 21:57:52 +0000 (10:57 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 7 Nov 2012 21:57:52 +0000 (10:57 +1300)
commit9a0e6f147d0d6f964152e2cd915fa384399e4ab1
tree32a5ba46b161a2f2de3041e90cbe58423eb07d89
parente2c5f3860595925e8f8bad8bd31abbf5a6e8832b
parent2bda04605ec6c9e23a3ae21a1a9c3b8e2bbfa434
Merge branch 'WIP-MDL-35249-master' of git://github.com/nadavkav/moodle

Conflicts:
mod/assign/gradingtable.php
mod/assign/gradingtable.php