Merge branch 'master_MDL-30146' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Nov 2011 01:13:38 +0000 (02:13 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Nov 2011 01:13:38 +0000 (02:13 +0100)
commit0a9ed36c9e533fc3c5987ca131cb7b702f50cae7
treec14c94f4981a74e7f3fbb2610aac33079458aeee
parentec25a72c4d917ae3773fab2cfb1f695b2ac80258
parent4388bd45b273e4688e601504dedb85fc217ab063
Merge branch 'master_MDL-30146' of git://github.com/danmarsden/moodle
mod/scorm/datamodels/aicclib.php
mod/scorm/lang/en/scorm.php