Merge branch 'wip-MDL-33468-m23' of git://github.com/samhemelryk/moodle

diff --cc lib/csslib.php
index 3ae362f,621b571..fc37a3d
--- 1/lib/csslib.php
--- 2/lib/csslib.php
+++ b/lib/csslib.php
@@@ -176,9 -175,9 +176,9 @@@ function css_send_cached_css($csspath, 
   * that theme designers could utilise the optimised output during development to
   * help them optimise their CSS... not that they should write lazy CSS.
   *
-  * @param string CSS
+  * @param string $css
   */
 -function css_send_uncached_css($css) {
 +function css_send_uncached_css($css, $themesupportsoptimisation = true) {
      global $CFG;
  
      header('Content-Disposition: inline; filename="styles_debug.php"');