Merge branch 'MDL-33330-files-reference' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 6 Jun 2012 08:18:30 +0000 (16:18 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 6 Jun 2012 08:18:30 +0000 (16:18 +0800)
commit79c2b50980f5b90a06efbff4c866f7ce34f92108
treef009eb858ec03320cdc41d373f5edf6ab1c94371
parentde6a0dfd3d6b6e16b2ee4be0bbf2f35616086b03
parent0ad654dc8bb214538b3320c745b28bd711b2bb3b
Merge branch 'MDL-33330-files-reference' of git://github.com/mudrd8mz/moodle

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