Merge branch 'MDL-46481-master' of https://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 8 Oct 2014 19:51:40 +0000 (08:51 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 8 Oct 2014 19:51:40 +0000 (08:51 +1300)
commit9ff13804e55e73f0843d3401e725acd316582d6b
treeffcc83e101bc1d2844915f53d46c4ee875806810
parent66689366a0589aea5b0cd1199bbdfd0db12177bf
parent70e7b634e459bed972113138baae7ff663ef106c
Merge branch 'MDL-46481-master' of https://github.com/FMCorz/moodle

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