Merge branch 'MDL-40835_master' of https://github.com/nadavkav/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 24 Sep 2013 22:02:57 +0000 (10:02 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 24 Sep 2013 22:02:57 +0000 (10:02 +1200)
commit35ed37be8f41977e5d3f5131c7a62f00098d6c15
tree662147cd1e108561b41cef8ce3c5ba76bf81eee4
parent548fbd8e1c906b48019fd97a472cc76aeb2c5c64
parentf6fbe8f4ea0e3cf56c5c01e021e28915e4becfd5
Merge branch 'MDL-40835_master' of https://github.com/nadavkav/moodle

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