Merge branch 'MDL-41591_zindex' of https://github.com/andyjdavis/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 23 Sep 2013 20:28:40 +0000 (08:28 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 23 Sep 2013 20:28:40 +0000 (08:28 +1200)
commit83c875a9a05f7057aab29755be3cc2905ce726d4
tree9a3cee639065cf24cd0ce44582a72e5db563c940
parentfe64d4f7c8df0ad5a9e21e80fc75d6de29231d8e
parentf44b89163086138750e79f4dd4a66a009dab002c
Merge branch 'MDL-41591_zindex' of https://github.com/andyjdavis/moodle

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