Merge branch 'MDL-41838-master' of git://github.com/sammarshallou/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 10 Oct 2013 02:49:11 +0000 (10:49 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 10 Oct 2013 02:49:11 +0000 (10:49 +0800)
commit370058d8fb9316a391b9cf15b375c64469ee794e
tree9f3c94205209a1d4bfaff2b3d657999f0bd3c75a
parent00ae230f526ee65218f373c27669d32b3adeeaa6
parent39e5102f8b8a4975fd1a8046264d736a89eedd34
Merge branch 'MDL-41838-master' of git://github.com/sammarshallou/moodle

Conflicts:
lib/upgrade.txt
backup/moodle2/backup_stepslib.php
lang/en/admin.php
lang/en/error.php
lib/filestorage/stored_file.php
lib/moodlelib.php
lib/upgrade.txt