Merge branch 'MDL-27704_master' of git://github.com/MaryE/moodle.git

diff --cc theme/fusion/style/core.css
index f6f45f3,efe2fe7..eb42816
--- 1/theme/fusion/style/core.css
--- 2/theme/fusion/style/core.css
+++ b/theme/fusion/style/core.css
@@@ -139,11 -139,12 +139,11 @@@ h6
  }
  
  #page-site-index #region-header {
-       margin-bottom: 55px;
 -    /* margin-bottom: 55px; */
+     margin-bottom: 65px;
 +}
  
  #region-header {
-       margin-bottom: 30px;
 -    /* margin-bottom: 30px; */
+     margin-bottom: 40px;
  }
  
  .headermain {
@@@ -367,7 -368,7 +367,7 @@@ h2.headingblock 
  }
  
  #dockeditempanel .dockeditempanel_hd .commands {
-       float: right;
+     float: right;
  }
  
--.pagelayout-redirect {background-position:0 0;}
++.pagelayout-redirect {background-position:0 0;}