Merge branch 'wip-MDL-35618-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Oct 2014 08:24:39 +0000 (09:24 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Oct 2014 08:24:39 +0000 (09:24 +0100)
commit08abbd61c20f89a8990d098941bcb199357ca71f
treeeb316bab069a23d9df0d16a054aed574a869796e
parent4a813f3959265d7108087c54a7e55f336e0ca170
parent58b5b04d4be686da6f132830ff7975494dd3a434
Merge branch 'wip-MDL-35618-master' of git://github.com/marinaglancy/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css
lib/upgrade.txt
theme/bootstrapbase/style/moodle.css