Merge branch 'MDL-46531-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Nov 2014 21:48:31 +0000 (10:48 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Nov 2014 21:48:31 +0000 (10:48 +1300)
commit06404b01180a2965804fab9e47715fdc2b6bdfb4
tree6e004b32847bfbd9374f6389bb0aae33e2e72ade
parent0f87473fed2da15a8ba72ac9a578734fe2548f10
parentee7432b32c58283812a4680598d6059ae0a886b9
Merge branch 'MDL-46531-master' of git://github.com/andrewnicols/moodle

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