Merge branch 'wip-MDL-31750-master' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Jan 2013 00:31:50 +0000 (01:31 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Jan 2013 00:31:50 +0000 (01:31 +0100)
commit8361f557a117211a21e657b8ad6b8bec402fbf69
tree17ee9b3b2d0a08f2c3c434b9b37e36b753507ea9
parent7316589831186ebda1c3ed2f2b41dc674cae8521
parent2b9e957a274c037b222b8159dbc03b49d61b2e47
Merge branch 'wip-MDL-31750-master' of git://github.com/abgreeve/moodle

Conflicts:
course/tests/courselib_test.php
course/category.php
course/edit.php
course/edit_form.php
course/lib.php
course/tests/courselib_test.php
lang/en/error.php