Git merges in Moodle 2.6.1 by Marina Glancy

commit df1914d111b2778bb876641564f418bd618b2009
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 17 Dec 2013 13:37:42 +0800
Tag:    v2.6.1

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

commit 6e39ee0c82530f7cd446d0ab72f52978e56854be
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 17 Dec 2013 13:36:00 +0800
Tag:    v2.6.1

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

commit 20b9e5301013fc9278cac521415b61a0517b27e7
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 17 Dec 2013 08:24:08 +0800
Tag:    v2.6.1

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

commit be7a37d442418312903283fd1b700fad1c4b12b8
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 16 Dec 2013 09:27:59 +0800
Tag:    v2.6.1

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

commit 06805cb54f82267206edcf9dec8b831a3237df1a
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 12 Dec 2013 13:51:05 +0800
Tag:    v2.6.1

Merge branch 'MDL-42625_26-failures-fix' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE

commit 26023575ba688747f182cdab03d08da9c05a9368
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 12 Dec 2013 12:39:51 +0800
Tag:    v2.6.1

Merge branch 'mucupdates26' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 856be66774be5162fdc31f6a2b43b75f49f5bfaf
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 11 Dec 2013 09:47:00 +0800
Tag:    v2.6.1

Merge branch 'MDL-43071-MOODLE_26_STABLE' of https://github.com/lucisgit/moodle into MOODLE_26_STABLE

commit 9f2e956580fe7f459059860c0f86c324b5e6280c
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 12:16:08 +0800
Tag:    v2.6.1

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

commit 4bc1b2151e1fe9f7a04d760fa51c2f77ab84855d
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 11:47:52 +0800
Tag:    v2.6.1

Merge branch 'm26_MDL-43082_IE9_Compat_View_SVG_Say_No' of https://github.com/scara/moodle into MOODLE_26_STABLE

commit 66a437aca83d5c89b6d9fb16e590c389c39ba30f
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 11:26:14 +0800
Tag:    v2.6.1

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

commit 3b70fdaaf34e343666c8a13f2caac2f4d8bad0c0
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 11:10:29 +0800
Tag:    v2.6.1

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

commit 08f6d5de07da5548da661e8c570afd8f9197a2ff
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 10:57:20 +0800
Tag:    v2.6.1

Merge branch 'mdl42487-moodle26' of https://github.com/tlock/moodle into MOODLE_26_STABLE

commit cc2aca7c2397d821f48ab2c74e797590178e0eaa
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 15:56:15 +0800
Tag:    v2.6.1

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

commit d66fe9c1aafa529d7eae430c9de55fc63ef01a00
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 15:46:36 +0800
Tag:    v2.6.1

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

commit 6203fc19f204929d4afc64ce579d697c9fa17ed0
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 15:28:35 +0800
Tag:    v2.6.1

Merge branch 'w50_MDL-42973_m26_addonupd' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 64c03072a944d21468f30fc5877b1db6a46d1ed9
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 14:50:53 +0800
Tag:    v2.6.1

Merge branch 'MDL-43092_M26' of git://github.com/lazydaisy/moodle into MOODLE_26_STABLE

commit 780dc00ce5b27dad111d1362e949917fd1ef1d89
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 13:15:59 +0800
Tag:    v2.6.1

Merge branch 'w50_MDL-43137_m26_openbasedir' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit c4bc56217270d515fa72d66d18330f57616fc7be
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 08:28:32 +0800
Tag:    v2.6.1

Merge branch 'm26_MDL-43192' of https://github.com/danmarsden/moodle into MOODLE_26_STABLE