Merge branch 'master_MDL-50133' of https://github.com/danmarsden/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 7 May 2015 02:24:11 +0000 (10:24 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 7 May 2015 02:24:11 +0000 (10:24 +0800)
commit7ae030d54e6470541c30abb10f2173b6484dbe23
tree57db59a1651883b48593aad91463e0a08e0a80cb
parent85643ff6e04f82863044dbd7095e6d7c273ffcce
parenta3747696401bb8f714f7f8447268056fe65dd28e
Merge branch 'master_MDL-50133' of https://github.com/danmarsden/moodle

Conflicts:
mod/scorm/version.php
mod/scorm/version.php