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

diff --cc theme/bootstrapbase/README.txt
Simple merge

diff --cc theme/bootstrapbase/config.php
index df6b44c,8cf9956..bd144fc
--- 1/theme/bootstrapbase/config.php
--- 2/theme/bootstrap/config.php
+++ b/theme/bootstrapbase/config.php
@@@ -31,9 -31,9 +31,9 @@@
  
  $THEME->doctype = 'html5';
  $THEME->yuicssmodules = array();
 -$THEME->name = 'bootstrap';
 +$THEME->name = 'bootstrapbase';
  $THEME->parents = array('');
- $THEME->sheets = array('generated');
+ $THEME->sheets = array('moodle');
  $THEME->supportscssoptimisation = false;
  
  $THEME->editor_sheets = array('editor');

diff --cc theme/bootstrapbase/less/README
index 19f5756,de4b898..9899bc1
--- 1/theme/bootstrapbase/less/README
--- 2/theme/bootstrap/less/README
+++ b/theme/bootstrapbase/less/README
@@@ -1,8 -1,8 +1,8 @@@
  If you want to make changes to the .css generated from these .less files then you
  need to install recess (https://github.com/twitter/recess) to compile the .less files,
 -then run these commands in the bootstrap/less/ folder:
 +then run these commands in the bootstrapbase/less/ folder:
  
- recess --compile --compress moodle.less > ../style/generated.css
+ recess --compile --compress moodle.less > ../style/moodle.css
  
  You can add --watch to make sure it updates every time you make a change.
  

diff --cc theme/bootstrapbase/readme_moodle.txt
Simple merge

diff --cc theme/bootstrapbase/style/README
Simple merge