Merge branch 'MDL-47197-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 7 Oct 2014 22:16:54 +0000 (11:16 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 7 Oct 2014 22:16:54 +0000 (11:16 +1300)
commitc709fafc6e6567b4ebe437bcb502b6b9c0bcb402
tree52eeccaa210ceed2ac2374a6cf97845597c2c2f8
parent70b370982f82a03ba4c6538e56ce72b40649e643
parent27f7487f82e43b1b91acb49296f5b8f96d6c2fa2
Merge branch 'MDL-47197-master' of git://github.com/andrewnicols/moodle

Conflicts:
lib/db/install.xml
lib/db/upgrade.php
version.php
lang/en/moodle.php
lib/classes/message/inbound/private_files_handler.php
version.php