Merge branch 'MDL-46161_files_reference_index' of git://github.com/davosmith/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 1 Jul 2014 12:37:56 +0000 (13:37 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Jul 2014 12:37:56 +0000 (13:37 +0100)
commit9b19282346029b6a8f43cc3e9b3f03e493ecfbf1
treefdf2c0def3cce41692dffddf4cfd90917a8bc507
parent2a957cda1795251818d579ecba807163711a795c
parent463882d0856b20579c04bea3cb5f529585fac98c
Merge branch 'MDL-46161_files_reference_index' of git://github.com/davosmith/moodle

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