Merge branch 'MDL-32919-core_course_import_course' of git://github.com/jleyva/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 17 Jul 2012 05:38:16 +0000 (17:38 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 17 Jul 2012 05:38:16 +0000 (17:38 +1200)
commitc1483c9c6cb71de4d39eebf8b2dcdde735f26e0d
treeb26b68270291722c47394445a159ff285bd24415
parent239311aaada4abf33d43e92210fdce90339b1097
parent5842c78fe02027d65c61ddf3984a364edde45f6f
Merge branch 'MDL-32919-core_course_import_course' of git://github.com/jleyva/moodle

Conflicts:
version.php
course/externallib.php
version.php