Merge branch 'wip-MDL-46576-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 6 Oct 2014 17:06:13 +0000 (18:06 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Oct 2014 17:06:13 +0000 (18:06 +0100)
commitf5bacd6539ac9b3d4d28465bdd0f0ee22c829d91
tree47fb6a28c1594cb90e9f4df8b613b66d37e843c8
parentfb991204a9c962dc2c75cfca1ede8aa6470d0fc8
parent102c1c36712284ecf62a4fcab71041f2e0f62e4e
Merge branch 'wip-MDL-46576-master' of git://github.com/abgreeve/moodle

Conflicts:
lib/upgrade.txt
    lib/db/upgrade.php
version.php
lib/db/upgrade.php
lib/upgrade.txt
version.php