Git merges in Moodle 2.6.x by Marina Glancy

commit efdbd1bd1d21ff23b20f15f937edc7d9179fb30f
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 11 Feb 2014 14:42:59 +0800
Tag:    v2.6.2

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

commit 98c5ac43584f454162e9c2b4227585d0c73d97cf
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 10 Feb 2014 18:16:42 +0800
Tag:    v2.6.2

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

commit 270cd5210369649cba600647136f640ee0b9969f
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 05 Feb 2014 15:57:21 +0800
Tag:    v2.6.2

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

commit 8ded044775890a977a11ab74b84061f4ad4dd20b
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 17:34:57 +0800
Tag:    v2.6.2

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

commit 839b58679dfdf76fd87544b449e1e5ee893ee5ea
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 16:09:37 +0800
Tag:    v2.6.2

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

commit 79efe4f22bb656bbe4814e473a2a7800c773792b
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 15:34:32 +0800
Tag:    v2.6.2

Merge branch 'w05_MDL-43905_m26_loginevents' of git://github.com/skodak/moodle into MOODLE_26_STABLE

commit 18a28dde45f308c8d723e0451e56d04f80684d96
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 15:07:53 +0800
Tag:    v2.6.2

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

commit 94776f1bfa88ae7a3f239dc31f929456006cea0c
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 14:54:11 +0800
Tag:    v2.6.2

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

commit 52b3120916b8b6fa9b22eafea15655dacbafebb3
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 13:43:50 +0800
Tag:    v2.6.2

Merge branch 'MDL-43440-26' of git://github.com/mr-russ/moodle into MOODLE_26_STABLE

commit 814a6297ece88ebb1b5f67b1987e7d42c25d92d9
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 31 Jan 2014 14:11:18 +0800
Tag:    v2.6.2

Merge branch 'install_26_STABLE' of git://git.moodle.org/moodle-install into MOODLE_26_STABLE

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

commit 2b6344c1d079124507509d4a17ac4c4dda0fceaf
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 15 Nov 2013 14:27:50 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42887-master' of git://github.com/damyon/moodle

commit 4c35937514a1bf0b8d234c1626cfaf7b86c77d22
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 13 Nov 2013 15:24:06 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42849-master' of git://github.com/andrewnicols/moodle

commit 1d2a7ef54f451bd53c524fae2fdc628ee75c2200
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 13 Nov 2013 12:43:44 +0800
Tag:    v2.6.0-rc1

Merge branch 'wip-mdl-42799' of https://github.com/rajeshtaneja/moodle

commit 5268dbffefc24b3495162d21d95a3a6485ede270
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 13 Nov 2013 10:28:46 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42827-master' of git://github.com/andrewnicols/moodle

commit 930fbd0505a6fabff41c5107fdbbaa2b762ca1dd
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 13 Nov 2013 08:05:25 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-38574' of git://github.com/timhunt/moodle

commit b6168f132bf3d2cbde38f6f26a7975f5026d1259
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Nov 2013 12:11:19 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42276_master' of https://github.com/markn86/moodle

commit b544b09636ae66ac85078a56d3b76db6c2abe42b
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Nov 2013 12:00:57 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42824-master-int' of git://github.com/FMCorz/moodle

commit c7ef5970400ce381ed40333c7b8ed5f0cd56f729
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Nov 2013 11:47:54 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42540' of git://github.com/timhunt/moodle

commit 57c9bdb250c5c0e4f4346c6b4fb2a96243e6f3bb
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Nov 2013 10:34:01 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42809-master' of git://github.com/andrewnicols/moodle

commit 82b211b6d0fca698446c3565105f1ee301468b60
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Nov 2013 08:23:51 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-41775_master' of git://github.com/grabs/moodle

commit c4ce365aa18ebf447d53b18356b30cbc1572e3b8
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 11 Nov 2013 18:48:39 +0800
Tag:    v2.6.0-rc1

Merge branch '42805-26' of git://github.com/samhemelryk/moodle

commit 459dd27d3e14075ea65b42766b536ec7ff50b48b
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 11 Nov 2013 18:10:47 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42043-master' of git://github.com/FMCorz/moodle

commit 40dd8899abc278cbf5530938f4fdcd473609d58b
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 11 Nov 2013 17:55:19 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42081-phpunitfix' of git://github.com/mouneyrac/moodle

commit b180048946ad0456828e4c2643e642722aa88999
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 11 Nov 2013 12:02:48 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42683-master-2' of git://github.com/mouneyrac/moodle

commit f1be232f68cc9a681b4e11cb064da74c2139a1a5
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 11 Nov 2013 12:02:01 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42081-master-nomerge2' of git://github.com/mouneyrac/moodle

commit 2e84b4b32374c1f49eb4c1388fc5d98373f6fa86
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 08 Nov 2013 13:37:55 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42775-master' of git://github.com/danpoltawski/moodle

commit 61d1e9c44dbfc3d1e35d9f8b266b49e4f02f4e18
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 08 Nov 2013 11:13:24 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-41586-master' of git://github.com/ankitagarwal/moodle

commit 9fec5cb3330321b62ac5aa21fb6d5d602d8803b0
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 08 Nov 2013 11:10:41 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42760-master' of git://github.com/mouneyrac/moodle

commit d1cfb36b59c36c47cc19e27c202ee91a24eca302
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 07 Nov 2013 16:31:52 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42748-master' of git://github.com/andrewnicols/moodle

commit cc58ba267d6ec19f47ffa6fa02a4e33b79fcb931
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 07 Nov 2013 14:17:42 +0800
Tag:    v2.6.0-rc1

Merge branch 'w46_MDL-42708_m26_mymobile' of https://github.com/skodak/moodle

commit 4c0e155433d86742bc00326d3fa946353ad63cae
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 07 Nov 2013 14:08:03 +0800
Tag:    v2.6.0-rc1

Merge branch '42375-26' of git://github.com/samhemelryk/moodle

commit afd765337ad0cb8bdccfae829bc325daa6b9e136
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 07 Nov 2013 13:31:01 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42697-master' of git://github.com/andrewnicols/moodle

commit 1dd53c7a5a8a45e8b193c4c46e46b5765265eb59
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 07 Nov 2013 12:06:38 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-41586-master' of git://github.com/ankitagarwal/moodle

commit ef14a8ffb4fdd7b1f96f3a3bfc6d6671b42b8601
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 07 Nov 2013 11:18:00 +0800
Tag:    v2.6.0-rc1

Merge branch '42375-26' of git://github.com/samhemelryk/moodle

commit 27199cfce84610561d90ce33c71581df660fcac9
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 07 Nov 2013 09:59:36 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42696-collator' of git://github.com/mudrd8mz/moodle

commit bdb7c88635889bd84c1f0bf527e07699436f8a91
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 06 Nov 2013 14:18:38 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42031-master' of git://github.com/mouneyrac/moodle

commit c32ba4e2fbd4737331db5eeca36419b21f32edd4
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 06 Nov 2013 12:52:03 +0800
Tag:    v2.6.0-rc1

Merge branch '42690-26' of git://github.com/samhemelryk/moodle

commit 0f57d555a0b53b2ae26481811f5e2f2effda5b0d
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 06 Nov 2013 08:56:20 +0800
Tag:    v2.6.0-rc1

Merge branch '42629-26-r2' of git://github.com/samhemelryk/moodle

commit a43db075ffa3a5fe0bfee0e412401841b49310d9
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 06 Nov 2013 08:52:15 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42402-master-fix3' of git://github.com/damyon/moodle

commit 792eeb0053cd88beea44f91d569e2272dd55dff5
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 05 Nov 2013 14:44:53 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-40267-master' of git://github.com/danpoltawski/moodle

commit edf21f0c567f85d93776a5d54e048cbcb9ab241b
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 05 Nov 2013 14:13:38 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42706-master-int' of git://github.com/FMCorz/moodle

commit 8be0ca758cecc56affe84dbdb6b5a2b24198340b
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 16:16:23 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42604-master' of git://github.com/ankitagarwal/moodle

commit 23f13c5304d96b43b2cb73545e9ac5e2e795cffa
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 14:27:57 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42429_master' of https://github.com/markn86/moodle

commit 197ab6efefdf2a95f272065372d6ece916d9bc23
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 14:22:45 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42566_master' of https://github.com/markn86/moodle

commit 753ce05b8c813e2ad2f043a429b12a5f92a62382
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 13:14:35 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42617' of git://github.com/jleyva/moodle

commit ad5a1a5d48157189d19ab3be32deb56bdb0e0717
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 12:59:27 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42633-master' of git://github.com/ankitagarwal/moodle

commit 78d877d40b687e5eb224e75be817c67e91473296
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 12:53:22 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42402-master' of git://github.com/damyon/moodle

commit feb09881fb4d3c9685b58a9ed6b5b29b74cc3c70
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 12:13:42 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-38664' of git://github.com/rwijaya/moodle

commit f19aab15656a40d3130903f5022a8056c2ea2198
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 10:17:58 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42664-performance_measuring_filter_manager' of git://github.com/mudrd8mz/moodle

commit d0a91156ab4d49f90fc5d8641e224a6aedc5d695
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 09:52:15 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42583-master' of git://github.com/ankitagarwal/moodle

commit df27570b934790384ebcfa1c70611d95070aa5b4
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 01 Nov 2013 10:23:30 +0800
Tag:    v2.6.0-rc1

Merge branch '42619-26' of git://github.com/samhemelryk/moodle

commit 1637827d75aa7731343530e1a78e6755fe521ae0
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 01 Nov 2013 10:04:29 +0800
Tag:    v2.6.0-rc1

Merge branch 'wip-mdl-42584' of https://github.com/rajeshtaneja/moodle

commit 35e903971bcc2c0ae8125f258b7e8474e21c9283
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 01 Nov 2013 09:42:17 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42565-master' of git://github.com/ankitagarwal/moodle

commit 003a81ee111d4439a9832a1066e5950d14ed907c
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 01 Nov 2013 09:16:20 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42356-master' of git://github.com/mouneyrac/moodle

commit d2941e88088d1871be305ef90b7dc3e29b25c3ca
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 01 Nov 2013 08:07:47 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42471-master' of git://github.com/andrewnicols/moodle

commit f5b2c9f4af3873da61549b65e2f83ceb2ae64a9f
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 31 Oct 2013 19:53:44 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42351-master' of git://github.com/damyon/moodle

commit bbb430bf5e75950935995a13f7e3b4616cc2de80
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 31 Oct 2013 19:17:40 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-41624' of git://github.com/jmvedrine/moodle

commit 595d9876bbc9f3a86d2f791419db8888ce9ce113
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 31 Oct 2013 18:16:37 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-40971_M26' of git://github.com/lazydaisy/moodle

commit 0219e54100140e931a0fdf9b61ff180ed5e9ade7
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 31 Oct 2013 12:59:54 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42587' of git://github.com/aolley/moodle

commit b53c155276d42b50f00b6117467072ec879031da
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 31 Oct 2013 12:49:22 +0800
Tag:    v2.6.0-rc1

Merge branch 'wip-MDL-42599-master' of git://github.com/abgreeve/moodle

commit 5ea6d66e9f3f4f11969a70f49d09ef536bea0a91
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 28 Oct 2013 13:56:45 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42028-master-4' of git://github.com/mouneyrac/moodle

commit 10b44ec93d6b40a499327bf631e99d312b171a07
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 25 Oct 2013 13:16:31 +0800
Tag:    v2.6.0-rc1

Merge branch 'w43_MDL-42207_m26_messageformat' of https://github.com/skodak/moodle

commit a2f56679f9e010f2952677db32d659c4c8cbba7b
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 25 Oct 2013 11:56:31 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-31938-master' of git://github.com/danpoltawski/moodle

commit c7944a72b39e29046058125a77d2a1ef2c165cfc
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 24 Oct 2013 12:29:15 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-35402_editor_rules' of git://github.com/davosmith/moodle

commit 33c4c3a3633ce37f2ba9e0f5394def52251e1a94
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 24 Oct 2013 11:15:05 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-41252-master' of git://github.com/mouneyrac/moodle

commit 90eb4ddd9a2285ebc60194c687f107200ad3e3d3
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Oct 2013 14:22:28 +0800
Tag:    v2.6.0-rc1

Merge branch '42246-26' of git://github.com/samhemelryk/moodle

commit d82a3b9f7625558d21633470fd999e8ffa5f57b4
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Oct 2013 12:34:47 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42427-master' of git://github.com/ankitagarwal/moodle

commit ab864f2c36b19db0863b7e4cfb401b106e07123d
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Oct 2013 10:59:50 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42426-master' of git://github.com/damyon/moodle

commit 4f10bc6bb089809913d3609a21c37809d300a664
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Oct 2013 10:51:00 +0800
Tag:    v2.6.0-rc1

Merge branch '42301-26' of git://github.com/samhemelryk/moodle

commit 63e77f410d1d6e3d2aee0b0070e43037fa2ede3b
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Oct 2013 10:11:13 +0800
Tag:    v2.6.0-rc1

Merge branch 'w43_MDL-42414_m26_rev' of https://github.com/skodak/moodle

commit c5df0a63bce27cf2509760dd7ad44baf47c931e2
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Oct 2013 08:43:23 +0800
Tag:    v2.6.0-rc1

Merge branch '42170-26' of git://github.com/samhemelryk/moodle

commit f9c86035c9e97594205c65e646728385c41cbeb6
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Oct 2013 08:05:59 +0800
Tag:    v2.6.0-rc1

Merge branch '42316-26' of git://github.com/samhemelryk/moodle

commit 295825feb6ebfebb3f8af047f7e6e1259936ce38
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Oct 2013 07:17:00 +0800
Tag:    v2.6.0-rc1

Merge branch 'w43_MDL-37813_m26_filterall' of https://github.com/skodak/moodle

commit a90e023b4a667ac0d4adf731a5bb02139f37917d
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 22 Oct 2013 12:03:28 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-26170_rss' of https://github.com/andyjdavis/moodle

commit 8f9560091f173689ac11c2699db29b18e827de4e
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 22 Oct 2013 11:08:12 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42239-master' of git://github.com/ankitagarwal/moodle

commit 83a3e35e566ad014ff3fc74a6eb5e4ce03aa6f68
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 22 Oct 2013 06:48:57 +0800
Tag:    v2.6.0-rc1

Merge branch 'wip-MDL-42177-master-three' of git://github.com/abgreeve/moodle

commit e4ffd3dc7b1ea54db262da3513fad74da2a9e91c
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 21 Oct 2013 12:58:51 +0800
Tag:    v2.6.0-rc1

Merge branch 'w43_MDL-42386_m26_etag' of https://github.com/skodak/moodle

commit e3d43f0d7340c44bf381382c9660d40f958a6bfd
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 15 Oct 2013 11:11:15 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-42234-master' of git://github.com/abgreeve/moodle

commit 41a403cd143c06c3e6b9df655149cb2a791f5273
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 15 Oct 2013 10:19:30 +0800
Tag:    v2.6.0-beta

Merge branch '41959-26' of git://github.com/samhemelryk/moodle

commit 38a5cc79f8ccfd13b46f4b538629eaa183244d10
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 15 Oct 2013 10:19:20 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-42230' of git://github.com/timhunt/moodle

commit 30fb3994553d7e9a2288e438f66cd6edb0915ab9
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 15 Oct 2013 09:10:34 +0800
Tag:    v2.6.0-beta

Merge branch '42258-26' of git://github.com/samhemelryk/moodle

commit 1b7930fe4acf9dea8d9ae44b4fd541aaab7214c2
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 11 Oct 2013 10:32:14 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-42238-master' of git://github.com/abgreeve/moodle

commit 0965a9be10356a29c296ab79c90c244161fa1851
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 10 Oct 2013 09:52:28 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-37153_master' of https://github.com/pauln/moodle

commit 44cd0b03af518681065f74e7611fa695ddc93842
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 10 Oct 2013 08:23:06 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-mdl-38155' of git://github.com/rajeshtaneja/moodle

commit 9c5d6183d599a18295f85b5bd81bfa44f354468e
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 10 Oct 2013 08:12:35 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-42143-master' of git://github.com/danpoltawski/moodle

commit 9e4561b2f2b5600e131df13da9b57950cc88b3c4
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 10 Oct 2013 06:36:30 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41993-master-fix1' of git://github.com/damyon/moodle

commit 04a4de20e812c3bb15d76d8f76631e1a5a60bd53
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Oct 2013 09:03:15 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-25176' of https://github.com/merrill-oakland/moodle

commit 10a8d3dd7c63e329974abf7b0fcaf1dca033ad26
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Oct 2013 08:52:39 +0800
Tag:    v2.6.0-beta

Merge branch 'w41_MDL-37717_m26_enrolwarn' of https://github.com/skodak/moodle

commit 1b87f313486dcdcd005f7fd109cb4c8d00828e1e
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 03 Oct 2013 16:10:31 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40829_mc' of https://github.com/rwijaya/moodle

commit 32e375bdcb29cb25a5cb808bbc6922af65ee56fd
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 03 Oct 2013 11:08:03 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-42023-master' of git://github.com/damyon/moodle

commit d794391d8be0f07c91242d3b6627ed341d66f1a5
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 02 Oct 2013 15:27:03 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41241-master-fix2' of github.com:damyon/moodle

commit 3b06d7b22b01cb0df9d09537b4b65e569092985c
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 02 Oct 2013 15:01:12 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-42021-master-int' of git://github.com/FMCorz/moodle

commit 0880a52c9a8a20203554da36df895b66cd1f4e02
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 02 Oct 2013 14:54:59 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40050-master' of git://github.com/FMCorz/moodle

commit a929e5e83d526702edc305ede5a6b99e2379c59a
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 02 Oct 2013 07:20:52 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-9873' of https://github.com/merrill-oakland/moodle

commit c9e4ade71e83654e22de1cc4c687c26738a63c0b
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Oct 2013 18:49:03 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-32592-master' of git://github.com/danpoltawski/moodle

commit 815f0ef33c935b11fd821c2e433730f3c1b7a270
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Oct 2013 18:42:37 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39653-master' of git://github.com/danpoltawski/moodle

commit 3a3e3fa3b5cbcefe4bee5762f6dc438a7054d3d2
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Oct 2013 12:45:14 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41989-master' of git://github.com/phalacee/moodle

commit 5c06e84ab278fa9691f393a7cb4b566e4075bf5f
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Oct 2013 12:21:50 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41912-master' of git://github.com/FMCorz/moodle

commit f09ecc6d8bb022b2a2f19892420078b8ac909c0a
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Oct 2013 08:01:17 +0800
Tag:    v2.6.0-beta

Merge branch '41988-26' of git://github.com/samhemelryk/moodle

commit 9e110593261c7664a95915dec156d5dc7689c12a
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 30 Sep 2013 16:04:38 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-12403-master' of git://github.com/danpoltawski/moodle

commit e6ec2366a8ee1a1db9c8447496d141a24bfe0391
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 30 Sep 2013 15:57:30 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41885-master' of git://github.com/danpoltawski/moodle

commit f13511451cb4e139e5d2755208f57f36f9b3a4f8
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 30 Sep 2013 14:09:40 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41954-workshop-zero-variance' of git://github.com/mudrd8mz/moodle

commit 093a6fe77fc39b06c804fbe4bfcac9834a52c966
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 25 Sep 2013 10:53:09 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41912-master' of git://github.com/damyon/moodle

commit 88a4cb473439f5a2875260368b92fac1bb808c12
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 25 Sep 2013 10:52:39 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41778_master' of https://github.com/nitzo/moodle

commit d0b63cbde580750e116d2c4b2832eda4ae0db907
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 25 Sep 2013 10:21:46 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41870-master' of git://github.com/damyon/moodle

commit e26e4b8a7b4ea734e754d6993c60cff362859fbe
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 25 Sep 2013 10:21:37 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41713-master' of git://github.com/phalacee/moodle

commit 7375d9eb1fce0a6a1238cd2a8e8cc9d9e5bc67d0
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 25 Sep 2013 09:53:48 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41421_master' of git://github.com/dmonllao/moodle

commit dbad2a65ec2f128360ac10b27b302afb526eb033
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 25 Sep 2013 08:54:19 +0800
Tag:    v2.6.0-beta

Merge branch 'w39_MDL-41223_m26_customlogin' of https://github.com/skodak/moodle

commit 0aab5cbc5921d27cc332af18c175c04339a0e95d
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Sep 2013 19:42:20 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40550_master' of https://github.com/totara/openbadges

commit 4fa30a89470379458a14d62e5c2bfffcad9d8ac0
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Sep 2013 19:31:46 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41929' of git://github.com/timhunt/moodle

commit 72f6cb3cd3b8789e470d6ac3234d67c97a347e49
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Sep 2013 18:00:24 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-39962-master' of git://github.com/abgreeve/moodle

commit bdc7ff589d63804e854156196c922fd76582f946
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Sep 2013 14:49:50 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41725-master-onecommit' of git://github.com/jamiepratt/moodle

commit c484e97f45ca89c0d773e9347da14442fd20af2c
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Sep 2013 14:33:50 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41733_master' of git://github.com/StudiUM/moodle

commit 84128f46b2381fdfccd49d05dc761bbd4ddf43c3
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Sep 2013 14:29:00 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41087-master' of git://github.com/sammarshallou/moodle

commit c925e4fa8e58052dcc8aed0a727eb5e7645042f3
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Sep 2013 09:49:02 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41840-master' of git://github.com/sammarshallou/moodle

commit d9fd72feb5745b8121a1747bc8f10260a46e1c31
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Sep 2013 09:48:49 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41669-master' of git://github.com/sammarshallou/moodle

commit cbbaffc7d3abeb970f4774e7b3b35eea73502e0f
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 23 Sep 2013 17:16:43 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41833-master' of git://github.com/ankitagarwal/moodle

commit 009e0d28ae714618447ad3e093f52b97bf29b6f0
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 23 Sep 2013 16:15:35 +0800
Tag:    v2.6.0-beta

Merge branch 'w39_MDL-37324_m26_phpmailer' of https://github.com/skodak/moodle

commit 3e36c789d7c5c90dbacf41d4391e20f57363c8e0
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 23 Sep 2013 12:48:10 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41311-master' of git://github.com/danpoltawski/moodle

commit b4430713784ece8dc66387ed971ffe6b0e056a59
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 23 Sep 2013 12:39:45 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-41772-master' of git://github.com/abgreeve/moodle

commit 2b7a557c28a1fb13eb0a510855a570fad8f5aa95
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 17 Sep 2013 14:43:12 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41622_b' of git://github.com/rwijaya/moodle

commit 9f21d248957f1ffe147a734ac0c37c126ac86db1
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 17 Sep 2013 09:10:44 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41612_b' of git://github.com/rwijaya/moodle

commit 4a91055f7c5973c8de37b03bac5ccaaf0588e6e1
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 17 Sep 2013 09:08:27 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39959-master' of git://github.com/ankitagarwal/moodle

commit 4ead3551439b95233f353a9bc8722a768a6dffd8
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 16 Sep 2013 15:14:18 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41621' of git://github.com/rwijaya/moodle

commit 81673647a914bb7b5eb804fc609be7324a6f47b9
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 16 Sep 2013 13:31:20 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41315-master' of git://github.com/damyon/moodle

commit ac6fb0ad17b227cf2819e9c10f8a9209705927e3
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 21 Aug 2013 08:28:47 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-32324' of git://github.com/timhunt/moodle

commit e542bc26d924e9140e4fda4430a33c792b19bfbf
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 21 Aug 2013 08:02:41 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-mdl-40042' of git://github.com/rajeshtaneja/moodle

commit e7c21ac3be117577dd84cc3b79ba1709b5c41ce6
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 06 Aug 2013 22:16:53 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-41025-m26' of git://github.com/samhemelryk/moodle

commit 25b8ce92784b270ebd2c57e8d99cdc73c3665008
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 06 Aug 2013 22:10:44 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-41024-m26' of git://github.com/samhemelryk/moodle

commit 9be9b412b1aead4888523263bfacff2f8dbf249a
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 06 Aug 2013 20:53:19 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-mdl-40126' of git://github.com/rajeshtaneja/moodle

commit 18a4335366c03011f3ca6b6b873e11f18b4be7fd
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 06 Aug 2013 20:33:55 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40935-master' of git://github.com/ankitagarwal/moodle

commit 4b96f2ae62f78323817f829eb7070c90a4014b3e
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 06 Aug 2013 19:05:47 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40682-master' of git://github.com/ankitagarwal/moodle

commit e7328732e90ae059cb80b2de2600f3b7622bdc90
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 06 Aug 2013 18:49:13 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41034-essay-broken' of git://github.com/ktemkin/moodle

commit 0fb7a90363662ae4f83db19d8c8cccbae6905f1d
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 06 Aug 2013 13:03:26 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-37962_beep' of git://github.com/andyjdavis/moodle

commit 87934924be2b35383982bcfaf41e4e566564de69
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 06 Aug 2013 12:38:08 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-31226-master' of https://github.com/lucisgit/moodle

commit f0655ecb7132d8a033f3d2cc4ee6d2c01c38282a
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 06 Aug 2013 11:04:38 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40737-master' of git://github.com/FMCorz/moodle

commit 50c6e3ebac5c9966544a0928c06c9426f5af6f04
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 15:46:22 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41029-master' of git://github.com/FMCorz/moodle

commit 698be6bbd09079723e0590ce518480f533fb665b
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 15:42:09 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40997-master' of git://github.com/FMCorz/moodle

commit fd6d13bab1de20e69b1cc44e06605ab5af6c353a
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 15:15:38 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-36011-master' of git://github.com/damyon/moodle

commit f5472d1fd4bdda5f2d388684637746317e7397e9
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 11:49:55 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-30852-master' of git://github.com/damyon/moodle

commit f64777a93f53f7ff57e8963480c05b07bfab73fd
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 11:15:25 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40825_master' of git://github.com/dmonllao/moodle

commit 40e0dbd5ac217a124ae33ed18b104bdba9317051
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 10:30:56 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40320-master' of git://github.com/sammarshallou/moodle

commit e22e263fa04a89f0d3a6d41b3e0cd5334901b8d8
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 10:19:45 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-35981-master' of git://github.com/damyon/moodle

commit 98260b31a50c5533f39af435c8d8fa8d41153813
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 08:48:36 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-mdl-40933' of git://github.com/rajeshtaneja/moodle

commit 73f0d9b638b0dfe8ec1ccf1b8015942a62bbd7e2
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 17 Jul 2013 10:45:18 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40701-master' of git://github.com/danpoltawski/moodle

commit 576151c9870a5fa88911aa589bcf64513e385862
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 17 Jul 2013 09:09:08 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40478-m' of git://github.com/andrewnicols/moodle

commit 3e2b5734dd0f5c3dfedad02e9bb539fb26e4cad5
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 16 Jul 2013 15:07:23 +0800
Tag:    v2.6.0-beta

Merge branch 'w29_MDL-40549_m26_oacleanup' of https://github.com/skodak/moodle

commit b7361a9be7b35689c0c29fa3800469ee5a75e624
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 16 Jul 2013 14:10:13 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-35851-master' of git://github.com/damyon/moodle

commit e2abbde44e48b23f7025a5c710140bab03675ddc
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 16 Jul 2013 12:29:24 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39812_bootstrapbase' of git://github.com/rwijaya/moodle

commit 792e6059beb21d1090be71bfd3a20f0c6c4fdb25
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 16 Jul 2013 11:48:27 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-40426-master' of git://github.com/abgreeve/moodle

commit ff2ca3ef3d00c25105ff544d3d98b322d7b8ee6d
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 16 Jul 2013 11:07:17 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-13114-master' of git://github.com/FMCorz/moodle

commit 50d1d9949b03b6f238027f8eda3769aa78334ceb
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 16 Jul 2013 10:16:27 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-30740-master' of git://github.com/danpoltawski/moodle

commit 73221dbdfea3f395ebafbe39b4ef3a34b8839595
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 15 Jul 2013 15:28:59 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-28466-oldata-remove' of git://github.com/danpoltawski/moodle

commit 5710055d410dfc4154191bc41e630320b8396516
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 15 Jul 2013 12:41:55 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40633' of git://github.com/timhunt/moodle

commit 3fd0ea3c1e8c78bdeefedba675053271c0a8b9d6
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 15 Jul 2013 11:07:37 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-28466-master' of git://github.com/danpoltawski/moodle

commit 918cc26541c25332d3e9470a6437290ceafa05f4
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 15 Jul 2013 10:40:46 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-39062-m26' of git://github.com/samhemelryk/moodle

commit 78eca0fc3c27addff9ae52bbeb9da2e444de9005
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 15 Jul 2013 10:25:23 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-40650-master' of git://github.com/abgreeve/moodle

commit 51230ba88e441bbdebc0154698f879e62fdd940e
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 18:16:21 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-31776-master-alternatenamesfix' of git://github.com/abgreeve/moodle

commit cb88ffb6982c8e12ac225ac21168065bd7321f5a
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 14:22:38 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-38366-master' of git://github.com/FMCorz/moodle

commit 06832223d4413fae2b965f9cc719f930779262ab
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 11:15:37 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40354-master' of git://github.com/ankitagarwal/moodle

commit f8be9f9e739e7973108912b23fd0bfb9c51110b0
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 09:58:44 +0800
Tag:    v2.6.0-beta

Merge branch 'm26_MDL-39832_Fix_Chrome_Issues_ETag_XSendfile_2ndRound' of https://github.com/scara/moodle

commit 9de65fffb69cf2929dd3574cd2e47fe15b3dd074
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 09:08:49 +0800
Tag:    v2.6.0-beta

Merge branch 'w28_MDL-40488_m26_admin' of https://github.com/skodak/moodle

commit 9100a8f4bb296a993a3eface3fea477d708c35c3
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 08:02:04 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40441' of git://github.com/timhunt/moodle

commit 9a2188812dbe8b954f4a9c2b62d22f310db4ce1c
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 07:58:09 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-mdl-40218' of git://github.com/rajeshtaneja/moodle

commit ed2896d990aea373315d76cb192f662475004281
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Jul 2013 19:34:49 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40472-master' of git://github.com/damyon/moodle

commit 73118a26876dd9f8cd3edc29747ad8e95d792e19
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Jul 2013 16:06:33 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-37065-master' of git://github.com/damyon/moodle

commit f64998fab3e63a39f8a1a04ad5699bad84c97fd4
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Jul 2013 14:32:16 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39020-master' of git://github.com/ankitagarwal/moodle

commit 8bed37619e31de0ff09bcc1efb650fa95230cadc
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Jul 2013 13:55:51 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-23646-master' of git://github.com/damyon/moodle

commit 84842f54dda9ba635db816b915b567a6cb662fa8
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Jul 2013 13:54:45 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-37565-master' of git://github.com/phalacee/moodle

commit b4a044f3fbcc7d6a13e8f3eb2aefb538d158657a
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Jul 2013 09:30:42 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40434' of git://github.com/timhunt/moodle

commit da107ae4283923c47af46d561069a784162e266e
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 13:36:42 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40207-master' of git://github.com/danpoltawski/moodle

commit 5883de26ae619925d978ce4d46f8426ae65f5f09
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 10:59:04 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40165-m' of git://github.com/andrewnicols/moodle

commit 4b4ac86a373a35028fd711964c1ed6d43782ccfa
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 09:18:30 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-38079_master' of git://github.com/mr-russ/moodle

commit ba75dfd10d027e2c10cf68eaf394eea849657ecf
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Jun 2013 08:43:29 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-40142-m26' of git://github.com/samhemelryk/moodle

commit 3bc90f93ee2483e252e5ea81c357dcfeac0cc736
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 14 Jun 2013 10:53:23 +0800
Tag:    v2.6.0-beta

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit 8ea7d3a2dbe4d3249cca0f17d2d62a13cbd54512
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 12 Jun 2013 15:22:22 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-37621-master-fix2' of git://github.com/damyon/moodle

commit 128e9315d6f87ebe20207f07ad5cbf17e292f52d
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 12 Jun 2013 14:53:49 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-37459-master-fix2' of git://github.com/damyon/moodle

commit ab8e5e795d46a3858bed6b5ce7e172262e7bd4fb
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 11 Jun 2013 13:57:14 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-37621-master' of git://github.com/damyon/moodle

commit 849a0161283fcf4313b308b66a07a01a432ea113
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 11 Jun 2013 13:32:27 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-37459-master-fix' of https://github.com/damyon/moodle

commit 7a70cfe638ef08297403d874418110c7d09549f1
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 11 Jun 2013 12:57:34 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-37459-master' of https://github.com/damyon/moodle