Merge branch 'm28_MDL-46406' of https://github.com/totara/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 20 Jul 2014 23:14:30 +0000 (11:14 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 20 Jul 2014 23:14:30 +0000 (11:14 +1200)
commitce3d7d5da9cbabd9b978bc7fc79258bee691b8d4
tree561de19e8d8e9db866fb639b91e3946db0421f04
parent365e80ba7680270dbac72d0c974ec4cf5166870c
parent22f8a3499881f7a18f8f9bb80bccc8c435956b57
Merge branch 'm28_MDL-46406' of https://github.com/totara/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css
theme/base/style/core.css
theme/bootstrapbase/style/moodle.css