Merge branch 'MDL-45380-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 19 May 2014 20:52:54 +0000 (08:52 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 May 2014 20:52:54 +0000 (08:52 +1200)
commitd57e3f8201b2fc18eeef9bce6b26f154515ad020
treed9193f799312e51d981d48ddaa238f8487753833
parentadb5d8a5d66a356976d632fdb05b80c5b951c5c5
parent2c47e5005b7ac8076a10ac6b2ade646434dd6e67
Merge branch 'MDL-45380-master' of git://github.com/FMCorz/moodle

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