Merge branch 'wip-mdl-41811' of git://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 28 Oct 2013 07:37:05 +0000 (15:37 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 28 Oct 2013 07:37:05 +0000 (15:37 +0800)
commitb1a6c9dc5253d1666659c86260747b965bf9998b
tree6050935fbf1eeca98ecf52bf98adfdd54258e548
parent10ac20830b620d9856f47555e2aa10d85f9bc5d6
parentd5814f4e22d081c560a635f1b8c78e7ddc827424
Merge branch 'wip-mdl-41811' of git://github.com/rajeshtaneja/moodle

Conflicts:
login/change_password.php
course/management.php
course/tests/behat/behat_course.php
lib/adminlib.php
lib/moodlelib.php
login/change_password.php
report/outline/user.php