Merge branch 'MDL-49101' of https://github.com/andrewhancox/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 7 Apr 2015 09:26:24 +0000 (17:26 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 7 Apr 2015 09:27:17 +0000 (17:27 +0800)
commit75ece778c5a760f79208065d118f2c9112878195
tree81c01330e60a5dccc53cbeb7851615a3fce26463
parentffb4eaa93fb956076544e995341a387ba50f289d
parent6398ff538763defce3c20263c381b38a37150537
Merge branch 'MDL-49101' of https://github.com/andrewhancox/moodle

Conflicts:
lib/db/upgrade.php
version.php
course/moodleform_mod.php
course/tests/behat/add_activities.feature
lang/en/admin.php
lib/db/upgrade.php
mod/choice/mod_form.php
mod/forum/mod_form.php
mod/lesson/mod_form.php
mod/quiz/mod_form.php
mod/workshop/mod_form.php
version.php