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)
commit929e32489ffa2f2885387f82f2c632e6db9000ee
treee39f4ed43b302b81876d7d0982c9acf49363f5d4
parente154e9d8cd5837961e58f1850783756b8a8cc680
parent6bf267776c1117e23403e88720872cd5429cccb9
Merge branch 'MDL-28261-master' of git://github.com/andrewnicols/moodle
lang/en/moodle.php
mod/scorm/lang/en/scorm.php
mod/scorm/player.php