Merge branch 'MDL-40056-master' of git://github.com/ankitagarwal/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 16 Jan 2014 08:35:22 +0000 (16:35 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 16 Jan 2014 08:35:22 +0000 (16:35 +0800)
1  2 
mod/scorm/locallib.php

Simple merge