Merge branch 'master_MDL-31888' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Mar 2012 04:29:39 +0000 (17:29 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Mar 2012 04:29:39 +0000 (17:29 +1300)
commitfe0979ea3d37b478649a622bfccc91c1f9ab5cf2
tree383f96e4e1aef1ddfd744bfdf80c867be9033759
parent52cbd9cbd24f124926c88213017814b5b54d5e2d
parent85a2d566e2195b4ca3f6c66d9546fda7674b31b6
Merge branch 'master_MDL-31888' of git://github.com/danmarsden/moodle

Conflicts:
mod/scorm/styles.css
mod/scorm/styles.css