Merge branch 'master_MDL-40371' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 3 Jun 2014 14:19:22 +0000 (15:19 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 3 Jun 2014 14:19:22 +0000 (15:19 +0100)
commited3f8591ed8b6a69169d2830d18d88884327a958
tree210d360e588b18ce30ec85b7e71299cda2b5ba08
parent0eb40618ba9a105d216f47d934c34b27d1b3e8b7
parent6a97697a2af06690981845506d4a8009b0bc8426
Merge branch 'master_MDL-40371' of git://github.com/danmarsden/moodle

Conflicts:
mod/scorm/lib.php
mod/forum/lib.php
mod/scorm/lib.php