Merge branch 'MDL-38196-master' of git://github.com/sammarshallou/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 10 Oct 2013 01:31:33 +0000 (09:31 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 10 Oct 2013 01:31:33 +0000 (09:31 +0800)
commitf0ae8d7a6608ee466f8995c51ad89d2a62703d7d
tree60e475790235e73e80a12d575e8ae1c0138fdda2
parent80d5b253e2b45aeca0cb659adbd0eab42bdf0234
parent77b3d9dfdff223cca546eb47db01375ba5052bc5
Merge branch 'MDL-38196-master' of git://github.com/sammarshallou/moodle

Conflicts:
backup/backup.php
theme/bootstrapbase/style/moodle.css
backup/backup.php
backup/moodle2/restore_stepslib.php
backup/util/includes/backup_includes.php
theme/base/style/core.css
theme/bootstrapbase/style/moodle.css