Merge branch 'MDL-43065-master' of git://github.com/damyon/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 3 Dec 2013 20:44:25 +0000 (09:44 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 3 Dec 2013 20:44:25 +0000 (09:44 +1300)
commit2a336e2a36f0360d45fa06e2242bdba59793cbc6
tree33e1951d750cd5fe90e2a5382a91ae9952c03fcd
parentdb9c8f4c7d6b1a970990a2c1f334f573bf85764c
parentdf9b573d85c44a0e791c207a5b220ec347b2dcd4
Merge branch 'MDL-43065-master' of git://github.com/damyon/moodle

Conflicts:
backup/util/ui/base_moodleform.class.php
backup/util/ui/base_moodleform.class.php
theme/base/style/core.css
theme/bootstrapbase/style/moodle.css