Merge branch 'wip-MDL-50851-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 14:17:14 +0000 (14:17 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 14:17:14 +0000 (14:17 +0000)
commit04a03ff2829f5b24a918191c9bfa736a4c7b36f6
treebe1cd512c3666d94863edc357cbdcb59e0e4e193
parentb8ab80f07e016857961fe21b94682ae04e5e3690
parent3da0c3cbf4094c53522aa824d2abc4fc57e83d54
Merge branch 'wip-MDL-50851-master' of git://github.com/marinaglancy/moodle
backup/util/dbops/restore_dbops.class.php
lib/adminlib.php
lib/db/upgrade.php
version.php