Merge branch 'master_MDL-41290' of git://github.com/danmarsden/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 9 Sep 2013 02:46:59 +0000 (10:46 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 9 Sep 2013 02:46:59 +0000 (10:46 +0800)
1  2 
mod/scorm/lang/en/scorm.php
mod/scorm/locallib.php

Simple merge
Simple merge