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)
commit05fc7ccc8278ac3728a986a7437fbae94fbd79ec
tree47c86ca57a21c1df3f2ee7196afd14c4abba2088
parenta3e57810c6537db1612b69afc1fdcbe5681bebd2
parent79949c1ba3289b15bfa2fb45d1275cd9fa36cc8a
Merge branch 'MDL-30098_master' of git://github.com/markn86/moodle

Conflicts:
course/tests/externallib_test.php
course/externallib.php
course/tests/externallib_test.php
lib/db/services.php