Merge branch 'MDL-39876-master' of git://github.com/sammarshallou/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 21 Aug 2013 00:08:46 +0000 (12:08 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 21 Aug 2013 00:08:46 +0000 (12:08 +1200)
commit6eee89bc8f73ef59ba7b837fbdc3ebb2c51436f6
tree4549d278a36524b882b1fa264564e5e0ac7eab3c
parente542bc26d924e9140e4fda4430a33c792b19bfbf
parentc290ac5510ca06b3eae557c2165c2f106dde46aa
Merge branch 'MDL-39876-master' of git://github.com/sammarshallou/moodle

Conflicts:
course/lib.php
14 files changed:
backup/import.php
calendar/lib.php
course/editsection.php
course/lib.php
course/loginas.php
course/manage.php
group/index.php
lib/accesslib.php
lib/adminlib.php
lib/modinfolib.php
lib/moodlelib.php
lib/pagelib.php
mod/chat/gui_ajax/index.php
mod/forum/lib.php