Git merges in Moodle 2.6.6 by Marina Glancy

commit 8e799494e96776483429ea7d08b1aaabc5ff405b
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 06 Nov 2014 11:42:39 +0800
Tag:    v2.6.6

Merge branch 'wip_MDL-48083_m26_rollback' of git://github.com/skodak/moodle into MOODLE_26_STABLE

commit 818a6ef982a5124915d0b0831311a450f2a315e6
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Nov 2014 17:05:26 +0800
Tag:    v2.6.6

Merge branch 'wip-mdl-45204-m26' of git://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE

commit dc8a9a1b83619e7583e6f2ea7774e211b7bb0fa4
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 30 Oct 2014 17:15:59 +0800
Tag:    v2.6.6

Merge branch 'MDL-25057-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 5023b2e9d81041531fe590cc7d38e5f7bc53a64b
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 30 Oct 2014 16:17:06 +0800
Tag:    v2.6.6

Merge branch 'MDL-47569_CC_Errors26' of git://github.com/moodlerooms/moodle into MOODLE_26_STABLE

commit 015934fd018a506f1da620d2364886228c58b317
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 30 Oct 2014 16:16:59 +0800
Tag:    v2.6.6

Merge branch '47970-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE

commit 9ca5b7d84541c76a714e1014204102573f6cfbdc
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 30 Oct 2014 14:18:07 +0800
Tag:    v2.6.6

Merge branch 'MDL-29873_26' of git://github.com/jmvedrine/moodle into MOODLE_26_STABLE

commit 6ef51ef5aafb839f408f74990de7278e396ef6e7
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 28 Oct 2014 12:24:24 +0800
Tag:    v2.6.6

Merge branch '47914-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE

commit 66f6a6ff307de4fcd4ae38af1b9f5aa57d5efa50
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 27 Oct 2014 11:49:48 +0800
Tag:    v2.6.6

Merge branch 'MDL-47882_scorm_loadsco_invalid_html_26_STABLE' of git://github.com/MorrisR2/moodle into MOODLE_26_STABLE

commit 81e20e147743382ca420d9e448cf225765479866
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 24 Oct 2014 11:55:42 +0800
Tag:    v2.6.6

Merge branch 'MDL-47340-26' of git://github.com/jethac/moodle into MOODLE_26_STABLE

commit fd0713b18b6636ab1dbdded4c45282ef91f90f3e
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 23 Oct 2014 16:58:34 +0800
Tag:    v2.6.6

Merge branch 'wip-MDL-47675-26' of git://github.com/abgreeve/moodle into MOODLE_26_STABLE

commit 6f0276ceaf3d91a41c3ea2686878bb4cac9fd472
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 20 Oct 2014 17:04:54 +0800
Tag:    v2.6.6

Merge branch 'wip_MDL-47754_m26_installredir' of git://github.com/skodak/moodle into MOODLE_26_STABLE

commit be54fc0412df5f51d1c1b2f104207eb897d69420
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 20 Oct 2014 14:09:02 +0800
Tag:    v2.6.6

Merge branch 'MDL-38065-fix-26' of git://github.com/jmarthaler/moodle into MOODLE_26_STABLE

commit 5f0def5568a43f07b10124c63dc0a21685e6a20c
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 07 Oct 2014 17:16:11 +0800
Tag:    v2.6.6

Merge branch 'MDL-31936-26-workshop-reset' of git://github.com/mudrd8mz/moodle into MOODLE_26_STABLE

commit 5104bb8a2419598b8626debdb5f023946e30083a
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 07 Oct 2014 10:10:33 +0800
Tag:    v2.6.6

Merge branch 'MDL-31936-26-workshop-reset' of git://github.com/mudrd8mz/moodle into MOODLE_26_STABLE

commit 88fc9ca21af516a0c24e24cdacdfcde09b5c6d4b
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Sep 2014 17:19:02 +0800
Tag:    v2.6.6

Merge branch 'MDL-46997-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE

commit 99756ca2b425809bb864895cd5505cb68b219183
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Sep 2014 17:13:23 +0800
Tag:    v2.6.6

Merge branch 'm26_MDL-47076' of git://github.com/totara/moodle into MOODLE_26_STABLE

commit 6b2f31d9303aa7757659e30e5f0a3836693b665f
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 08 Sep 2014 14:07:26 +0800
Tag:    v2.6.6

Merge branch 'MDL-46818_m26' of git://github.com/markn86/moodle into MOODLE_26_STABLE

commit 9251dcc683ee55810756ef11e2f6fd94da7b8c9e
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 08 Sep 2014 13:50:44 +0800
Tag:    v2.6.6

Merge branch 'MDL-46564_26' of https://github.com/totara/openbadges into MOODLE_26_STABLE

commit cf923754c6d6397ec4e3cb11e0f3501000cf678f
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 08 Sep 2014 13:50:27 +0800
Tag:    v2.6.6

Merge branch 'MDL-46761_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE

commit dee890f67e735006c310858a4785e2ce9ae0e265
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 08 Sep 2014 13:50:19 +0800
Tag:    v2.6.6

Merge branch 'MDL-46587-26' of git://github.com/jleyva/moodle into MOODLE_26_STABLE

commit 84ddbba784e981a212c12ebee6a484827fbff2d9
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 08 Sep 2014 12:58:41 +0800
Tag:    v2.6.6

Merge branch 'MDL-44304-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE