Merge branch 'wip-MDL-42016-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 9 Oct 2013 02:57:30 +0000 (15:57 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 9 Oct 2013 02:58:45 +0000 (15:58 +1300)
commitf18f96f767af3ca4cbd6e12e6cb0ec6e990217eb
treeab4def2bebcb6a4ab8f8042090546d6902a65d04
parente9091a28f5e5f9066f5b6c552b48cd87059ac423
parent5e5923ea28fa646f0ddfbc9101995835f8cffb5d
Merge branch 'wip-MDL-42016-master' of git://github.com/marinaglancy/moodle

Conflicts:
lib/db/install.xml
lib/db/upgrade.php
version.php
lib/db/install.xml
lib/db/upgrade.php
lib/filelib.php
lib/filestorage/file_storage.php
lib/phpunit/classes/util.php
lib/upgrade.txt
version.php