Merge branch '44944-27' of git://github.com/samhemelryk/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 9 Apr 2014 01:48:41 +0000 (09:48 +0800)
committerMarina Glancy <marina@moodle.com>
Wed, 9 Apr 2014 01:48:41 +0000 (09:48 +0800)
commit47a1315f02e4236208c1a973fb7f87ede2954bf6
treed11d3ae885d66c221f45de534e2466f23180b8d5
parente97b942223bec58afbe408372bef92560519b9f5
parentaf23b60598aca46f8307c16aa14a25630186215f
Merge branch '44944-27' of git://github.com/samhemelryk/moodle

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