Merge branch 'MDL-42711-master' of git://github.com/nebgor/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 14 Nov 2013 09:18:44 +0000 (17:18 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 14 Nov 2013 09:18:44 +0000 (17:18 +0800)
commitf2f23af955d89dad13e5c83f18f2675955430f3d
treef554ebb38b47f4ef603f6b086e00d08682126496
parent529d3bad0e7f127372574498c201aaa7f841383f
parentfa41a73fe79432c888c41fbeb1d403a8bdb9f02f
Merge branch 'MDL-42711-master' of git://github.com/nebgor/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css
filter/glossary/filter.php
lib/navigationlib.php
theme/bootstrapbase/less/moodle/blocks.less
theme/bootstrapbase/less/moodle/core.less
theme/bootstrapbase/less/moodle/course.less
theme/bootstrapbase/less/moodle/responsive.less
theme/bootstrapbase/style/moodle.css