Merge branch 'MDL-30098_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Feb 2013 22:38:20 +0000 (23:38 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Feb 2013 22:38:20 +0000 (23:38 +0100)
Conflicts:
course/tests/externallib_test.php


No differences found