Merge branch 'MDL-45893-master-v3' of git://github.com/jethac/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Oct 2014 15:52:07 +0000 (16:52 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Oct 2014 15:52:07 +0000 (16:52 +0100)
commit99675668b423d7e8030cc4f3ee5ccc3f5bbe86e5
tree2313819c1beef22290bf59ac26023307bc9536d5
parent409318eeff36eb9d47a6a00c58b74fb8bcaf5a48
parent854a647e6206733fbf4aaedc8c42d8dc59d73745
Merge branch 'MDL-45893-master-v3' of git://github.com/jethac/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css
lang/en/moodle.php
theme/bootstrapbase/less/moodle/responsive.less
theme/bootstrapbase/style/moodle.css