Merge branch 'MDL-39278-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 26 Apr 2013 09:10:09 +0000 (11:10 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 26 Apr 2013 09:10:09 +0000 (11:10 +0200)
commita86103e09bb5f0439ab0f5cf468b829b246d05aa
treeb31b5a53ff445dd4edbc49abd5a8b8481250395e
parent1c97061a352244c9b22c3abffbfd2ed07b9f2fbf
parent36f33e3c2ca49c7f49fd1d4b5c2d4c60a40f43bc
Merge branch 'MDL-39278-master' of git://github.com/damyon/moodle

Conflicts:
theme/bootstrap/style/generated.css
theme/bootstrap/style/moodle.css
theme/bootstrapbase/less/moodle/recess.txt
theme/bootstrapbase/style/generated.css
theme/bootstrapbase/README.txt
theme/bootstrapbase/config.php
theme/bootstrapbase/less/README
theme/bootstrapbase/readme_moodle.txt
theme/bootstrapbase/style/README