Merge branch 'MDL-28261-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Apr 2014 23:12:52 +0000 (01:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Apr 2014 23:12:52 +0000 (01:12 +0200)
1  2 
lang/en/moodle.php
mod/scorm/lang/en/scorm.php
mod/scorm/player.php

Simple merge
Simple merge
Simple merge