Merge branch 'wip-MDL-51867-master2' of https://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Mar 2016 05:12:03 +0000 (13:12 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Mar 2016 05:13:57 +0000 (13:13 +0800)
commit4a166bfd161f4bc2ceaeed86e67de9c7cc722ad9
treec66cb6d0a0c006cb3cd421ea4455ad41832a3836
parent8c16f34c88967f0dfd571c851e00d6bb370e8652
parent322f3141556db52ff865f7e615bfb558b820d784
Merge branch 'wip-MDL-51867-master2' of https://github.com/marinaglancy/moodle
lib/deprecatedlib.php
lib/moodlelib.php
lib/upgrade.txt