Merge branch 'master_MDL-26880_SCORM2004_tracking_fix' of git://github.com/danmarsden...
authorPetr Skoda <commits@skodak.org>
Sun, 17 Apr 2011 15:16:03 +0000 (17:16 +0200)
committerPetr Skoda <commits@skodak.org>
Sun, 17 Apr 2011 15:16:03 +0000 (17:16 +0200)

Trivial merge