Merge branch 'MDL-45893-master-v2' of git://github.com/jethac/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 29 Sep 2014 09:30:42 +0000 (10:30 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 29 Sep 2014 09:30:42 +0000 (10:30 +0100)
commitf03b6121911a96667de83ae69ecd20154bf663df
treed73c4e55bf2d5d138d2049b9f24e399b1ab933eb
parent525b6ebeb9c4698908162e0f3bec6674d2bce8c3
parentd24b8e52d38526bf62612c3569db1d3174613c77
Merge branch 'MDL-45893-master-v2' of git://github.com/jethac/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css
lib/outputrenderers.php
theme/bootstrapbase/less/moodle/modules.less
theme/bootstrapbase/less/moodle/responsive.less
theme/bootstrapbase/style/moodle.css