Merge branch 'MDL-41569-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 7 Apr 2014 08:01:56 +0000 (16:01 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 7 Apr 2014 08:01:56 +0000 (16:01 +0800)
commit5e8be14cb98b3f70b0867e9c4623760c621dcc35
tree5eb1a9fbdde5408f6b248842bec87fe307b44127
parent2aa476bbc80449904db03108ea41607c5a2293bf
parent51e73837b6c3c1addaa81022065bcf6b31e12224
Merge branch 'MDL-41569-master' of git://github.com/damyon/moodle

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