Merge branch 'MDL-26644-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 3 Apr 2013 06:32:11 +0000 (14:32 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 3 Apr 2013 06:32:11 +0000 (14:32 +0800)
commit7bf602d9d30b53b9f0beb5142639794a4085b3ad
tree875cdeb95a1e2dba5a0c22fa8fdf1a47fe4041c5
parentdc4260d918a81b8e43f3743b4c42591f7dc2ac3a
parent8819a836017cf762ab4bbb91034c3864d4059bc9
Merge branch 'MDL-26644-master' of git://github.com/FMCorz/moodle

Conflicts:
lib/db/install.xml
lib/db/upgrade.php
admin/settings/courses.php
course/edit_form.php
course/externallib.php
lib/db/install.xml
lib/db/upgrade.php