Merge branch 'MDL-32479_master' of git://github.com/lazydaisy/moodle

Conflicts:
	theme/base/style/core.css

diff --cc theme/base/style/core.css
index 58e93ef,813f353..3938b49
--- 1/theme/base/style/core.css
--- 2/theme/base/style/core.css
+++ b/theme/base/style/core.css
@@@ -805,7 -805,12 +805,8 @@@ sup {vertical-align: super;
  #page-admin-setting-enrolsettingsflatfile.dir-rtl .informationbox {direction: ltr;text-align: left;}
  
  #page-admin-grade-edit-scale-edit.dir-rtl .error input#id_name {margin-right: 170px;}
+ .initialbar a {padding-right: 2px;}
  
 -/* Invert alignment of all hard coded table cell internal alignment, when in RTL mode */
 -.dir-rtl td[align="left"] {text-align: right;}
 -.dir-rtl td[align="right"] {text-align: left;}
 -
  /**
   * Chooser Dialogue
   *
@@@ -972,6 -958,6 +973,4 @@@
      box-shadow: 0px 0px 10px 0px #CCCCCC;
      -webkit-box-shadow: 0px 0px 10px 0px #CCCCCC;
      -moz-box-shadow: 0px 0px 10px 0px #CCCCCC;
--}
--
- .initialbar a {padding-right: 2px;}
 -#yui-module-debug {display:none;}
++}

diff --cc theme/base/style/course.css
Simple merge