Merge branch 'master_MDL-24734_gradefix' of git://github.com/danmarsden/moodle
authorPetr Skoda <commits@skodak.org>
Sun, 17 Apr 2011 15:09:05 +0000 (17:09 +0200)
committerPetr Skoda <commits@skodak.org>
Sun, 17 Apr 2011 15:09:05 +0000 (17:09 +0200)
1  2 
mod/scorm/locallib.php

Simple merge