Merge branch 'MDL-42111' of git://github.com/rwijaya/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Nov 2013 07:32:34 +0000 (15:32 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Nov 2013 07:32:34 +0000 (15:32 +0800)
commit466fa368b58665d2e615beb42609f417ca5fd6f2
tree6662d524dcd9409f6773f46bf9b1ffc3fd4d0b57
parentf6015bbf0203f68a423784f13bc822889dc7343d
parentf6606495e469677a852043c1037e315044aa98b0
Merge branch 'MDL-42111' of git://github.com/rwijaya/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css
theme/bootstrapbase/less/moodle/core.less
theme/bootstrapbase/less/moodle/responsive.less
theme/bootstrapbase/style/moodle.css