Merge branch 'm20_MDL-26176_cleanup' of github.com:danmarsden/moodle

diff --cc mod/scorm/datamodels/scorm_12lib.php
index a2bb032,a0a03c0..b8ac6f2
--- 1/mod/scorm/datamodels/scorm_12lib.php
--- 2/mod/scorm/datamodels/scorm_12lib.php
+++ b/mod/scorm/datamodels/scorm_12lib.php
@@@ -371,6 -346,4 +346,4 @@@ function scorm_get_toc($user,$scorm,$to
      $result->tocmenu = $OUTPUT->single_select($url, 'scoid', $tocmenus, $sco->id, null, "tocmenu");
  
      return $result;
 -}
 +}
- 
- 

diff --cc mod/scorm/datamodels/scorm_13lib.php
index cff809d,874123a..496d541
--- 1/mod/scorm/datamodels/scorm_13lib.php
--- 2/mod/scorm/datamodels/scorm_13lib.php
+++ b/mod/scorm/datamodels/scorm_13lib.php
@@@ -260,6 -238,4 +238,4 @@@ function scorm_get_toc($user,$scorm,$to
      $result->tocmenu = $OUTPUT->single_select($url, 'scoid', $tocmenus, $sco->id, null, "tocmenu");
  
      return $result;
 -}
 +}
- 
-