Merge branch 'MDL-40938-27' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Feb 2014 01:16:12 +0000 (14:16 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Feb 2014 01:16:12 +0000 (14:16 +1300)
commit1c8c3a6db19714612ecf20559997fed9b1f1a283
tree444cc2e3e77d80c9c36fd966b7bdc43dfb07bcbe
parent1cb3c0facc54156b2de18c65c3e7200db480e7d5
parent97080d53ee3c7d1ef0e5464ccba086409e692642
Merge branch 'MDL-40938-27' of git://github.com/lazydaisy/moodle

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