Git merges in Moodle x.x.x by Marina Glancy

commit 47a1315f02e4236208c1a973fb7f87ede2954bf6
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 09 Apr 2014 09:48:41 +0800
Tag:    v2.7.0-beta

Merge branch '44944-27' of git://github.com/samhemelryk/moodle

commit d175d25adc14cb4a30afda970aa556214fec2922
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Apr 2014 16:55:49 +0800
Tag:    v2.7.0-beta

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

commit 39b70b23b72d66b8d86aa17557a9217d88e97388
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Apr 2014 11:14:52 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44677_scorm_commit' of git://github.com/davosmith/moodle

commit 593fc9d8d674078c066343ba10acf4c966d612bb
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Apr 2014 11:13:43 +0800
Tag:    v2.7.0-beta

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

commit aaba0d56e2c0831737112abafb5dfcb36afd7250
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Apr 2014 11:13:17 +0800
Tag:    v2.7.0-beta

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

commit 72c0f16889f5bb7d395ce0fd19b5e03af99ec800
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Apr 2014 08:53:58 +0800
Tag:    v2.7.0-beta

Merge branch 'master_MDL-44938' of git://github.com/danmarsden/moodle

commit 08cf1d787eb271a868b667c0cff64ea818f67190
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Apr 2014 08:53:49 +0800
Tag:    v2.7.0-beta

Merge branch 'master_MDL-43011' of git://github.com/danmarsden/moodle

commit 0f4fc5a87852f3e99e185bdefbeb92dd915175bc
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Apr 2014 08:53:35 +0800
Tag:    v2.7.0-beta

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

commit efa6ee356bd169717675f967a71828c126f13b12
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Apr 2014 08:34:24 +0800
Tag:    v2.7.0-beta

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

commit a8e4b006ced9ae5f45ed8d3508b0723b9025b75f
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 07 Apr 2014 16:16:32 +0800
Tag:    v2.7.0-beta

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

commit 502ff062a07cc59b8e7bc1c944da350a233ab23c
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 07 Apr 2014 16:16:25 +0800
Tag:    v2.7.0-beta

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

commit bc348632e1652402ba4061c6aa4873a6905c8a1f
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 02 Apr 2014 14:57:40 +0800
Tag:    v2.7.0-beta

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

commit ac32e4282776f32d184d05e773722f5f95f84364
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 02 Apr 2014 14:54:59 +0800
Tag:    v2.7.0-beta

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

commit a5af7087db4d0bca954d1a2a14d3d5befcf4e221
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 02 Apr 2014 09:56:46 +0800
Tag:    v2.7.0-beta

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

commit 0123472c87de1e62a178b5458584883e289e1e42
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 02 Apr 2014 09:46:35 +0800
Tag:    v2.7.0-beta

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

commit cc7c745c7d58b4620eace94ed26df6297b0c56ab
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 02 Apr 2014 09:15:33 +0800
Tag:    v2.7.0-beta

Merge branch 'master_MDL-44753' of git://github.com/danmarsden/moodle

commit b3d75528defa2f9d4b8fa1d54ec62a204241c82a
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 17:40:35 +0800
Tag:    v2.7.0-beta

Merge branch 'w14_MDL-40910_m27_usergraded' of git://github.com/skodak/moodle

commit e3e9701113f42c9bdae6026c590f7a7fe87ed3ca
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 17:40:22 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-MDL44021' of git://github.com/jennymgray/moodle

commit 5bb81ad437d08d69b69653091d1750c3a9bfe700
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 15:50:14 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44770-master' of git://github.com/jethac/moodle

commit 1a1049990f42df2ad9e874b88d90793ad0878183
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 15:42:21 +0800
Tag:    v2.7.0-beta

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

commit 99342b5197784c482d6ab86c4f1304def08bffb6
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 15:35:05 +0800
Tag:    v2.7.0-beta

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

commit 7fff0290ebb63156540cb37bac4e7e0053ea4485
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 15:34:44 +0800
Tag:    v2.7.0-beta

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

commit 9632cad16b6a593ab0f613b9460a496ad2b5da94
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 15:34:28 +0800
Tag:    v2.7.0-beta

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

commit 9746748e04112381a9ab2481f07233da14d39726
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 15:33:38 +0800
Tag:    v2.7.0-beta

Merge branch 'W14_MDL-44862_m27_pgsocket' of git://github.com/skodak/moodle

commit 3accdbff6017c0c290655ae45ee8aa9ed0a60747
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 14:44:13 +0800
Tag:    v2.7.0-beta

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

commit 0a4af310fd8865626d107ef04ee587dae9819625
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 14:43:49 +0800
Tag:    v2.7.0-beta

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

commit e50a6fa5fb63a89705af484e1f91df1f73f9fc2e
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 14:26:08 +0800
Tag:    v2.7.0-beta

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

commit 0b5f5231645eaeb3b2073a053c1a8fbe8211b25f
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 14:24:54 +0800
Tag:    v2.7.0-beta

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

commit 75823325d333ee637137e2c213291a2980da190c
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 13:51:09 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44746_master' of git://github.com/markn86/moodle

commit 0b1afc71bb5b2dcad9fdaf57463d07762844442a
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 13:45:59 +0800
Tag:    v2.7.0-beta

Merge branch 'w14_MDL-44715_m27_eventval' of git://github.com/skodak/moodle

commit 2f7949cd575b85da436ba9c64b7d0c62c7351274
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 13:32:03 +0800
Tag:    v2.7.0-beta

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

commit 902eec06e951740260a22c0fe861f0e5db13e0b8
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 13:24:09 +0800
Tag:    v2.7.0-beta

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

commit 814f40ba310508e5f2c73b4f921f100975a4cdf1
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 11:19:26 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44763_preview_int' of https://github.com/andyjdavis/moodle

commit d767af7c2d9811700dc30ffb37b1d731531d3b79
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 11:08:40 +0800
Tag:    v2.7.0-beta

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

commit e57f83a5c01c07682739c885b73fc88d2fe95e95
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 11:06:23 +0800
Tag:    v2.7.0-beta

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

commit 502abeebb6d54758829a02d03d4cd8d2820fdb08
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 11:05:31 +0800
Tag:    v2.7.0-beta

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

commit 31374d59d0c0f1e038eaa4c9760c3a57b4fbcbbc
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 11:04:52 +0800
Tag:    v2.7.0-beta

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

commit 5259d5131767901ae26cdc4019861148372bf5d6
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 10:39:24 +0800
Tag:    v2.7.0-beta

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

commit 1bc60971b1ee4d5a87023a8722bee862ed3f35a0
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 10:37:22 +0800
Tag:    v2.7.0-beta

Merge branch 'wip_MDL-44854_master' of git://github.com/gjb2048/moodle

commit 771b121287d091a44f2a14278cf28309aa460425
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 10:36:00 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-MDL-44850_master' of git://github.com/gjb2048/moodle

commit 0cbc523621437051b3475fcdcef813c78a49b962
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 31 Mar 2014 16:36:27 +0800
Tag:    v2.7.0-beta

Merge branch 'w14_MDL-44733_m27_taskdisabled' of git://github.com/skodak/moodle

commit de19c44c82ae54ef20a5236da2d54cdd4bc58299
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 31 Mar 2014 16:36:12 +0800
Tag:    v2.7.0-beta

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

commit b13f4e8e7cf7f8fed9036d7b01be9e736fc8a1a0
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 31 Mar 2014 15:55:29 +0800
Tag:    v2.7.0-beta

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

commit 7e1288f847ef195bd428e3e4226322918c6d6376
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 31 Mar 2014 12:46:21 +0800
Tag:    v2.7.0-beta

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

commit c531e2e632e389ad3740f390e2cf8e05eb5b0735
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 31 Mar 2014 11:03:31 +0800
Tag:    v2.7.0-beta

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

commit a5c3dec8e8f131703a5fb8d893668de7aa04dde3
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 27 Mar 2014 16:52:05 +0800
Tag:    v2.7.0-beta

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

commit f2bf88130db5c90252f1d3cf55a6e24fe917ee7e
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 26 Mar 2014 14:10:53 +0800
Tag:    v2.7.0-beta

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

commit a93c8266982d573fba1a3cc69e3bdb100dd154cf
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 26 Mar 2014 10:02:06 +0800
Tag:    v2.7.0-beta

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

commit 09bcedb39e7bf4741ceec5d7f6423b56b28d86ea
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 26 Mar 2014 10:01:06 +0800
Tag:    v2.7.0-beta

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

commit 66113ef0ef7646ff5aca546f7ba41263b3c72c50
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 25 Mar 2014 18:08:40 +0800
Tag:    v2.7.0-beta

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

commit daf7b64ef751147f9f851652437c4133d9872866
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 25 Mar 2014 17:10:27 +0800
Tag:    v2.7.0-beta

Merge branch 'w13_MDL-44107_m27_canview' of git://github.com/skodak/moodle

commit 0029497ca5d307f243bd31dc5f0230930349eb68
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 25 Mar 2014 16:49:14 +0800
Tag:    v2.7.0-beta

Merge branch 'w13_MDL-44732_m27_clitask' of git://github.com/skodak/moodle

commit da1a0bc3a99af7e9aa42289f2634a7685c2e129b
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 25 Mar 2014 16:49:01 +0800
Tag:    v2.7.0-beta

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

commit d43556a63fc252f3cdd90e44ad0b1403b106351f
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 25 Mar 2014 16:20:37 +0800
Tag:    v2.7.0-beta

Merge branch 'mdl44573-master' of git://github.com/tlock/moodle

commit c5ff2a76e19f12ca696c3fba60cd8c5b159fbfe0
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 25 Mar 2014 16:19:33 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-42575-master' of git://github.com/jethac/moodle

commit e9e3431ad9d5efe968a53e76b6088e15bf1f62be
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 25 Mar 2014 16:18:28 +0800
Tag:    v2.7.0-beta

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

commit 2bcb6dbeb02aa38767a2a0ca78550ca254f9537e
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 25 Mar 2014 14:28:55 +0800
Tag:    v2.7.0-beta

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

commit 3f4a4daa036250774fd39aa81b1c05e27e13e404
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 25 Mar 2014 14:28:10 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44704_master' of git://github.com/markn86/moodle

commit 390f3c6ade968e4f66a4c1497a4a4b4fea8c26b7
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 25 Mar 2014 14:27:42 +0800
Tag:    v2.7.0-beta

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

commit dd043de942ad1f8313a8462fb7cc66fe859097fd
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 25 Mar 2014 14:15:19 +0800
Tag:    v2.7.0-beta

Merge branch 'w13_MDL-44106_m27_requestorig' of git://github.com/skodak/moodle

commit 19b4e349414e8915873e1c3dee4198ece72aada1
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 25 Mar 2014 14:06:41 +0800
Tag:    v2.7.0-beta

Merge branch 'w13_MDL-41284_m27_stats' of git://github.com/skodak/moodle

commit 81e50a3661a5b10a20f7d38d6080cd1aa3e33e6d
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 25 Mar 2014 14:03:06 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44316_master' of git://github.com/markn86/moodle

commit d11302b64673a72ba973eb45fb9c0e66e334d527
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 24 Mar 2014 17:27:41 +0800
Tag:    v2.7.0-beta

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

commit 66cb56ade6ae329a976c43b55d193dbbe86dc749
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 24 Mar 2014 17:02:10 +0800
Tag:    v2.7.0-beta

Merge branch 'w13_MDL-44639_m27_taskdocs' of git://github.com/skodak/moodle

commit 0b536b368ceaf57d0f2ce05da73956a01430c1bb
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 24 Mar 2014 15:38:58 +0800
Tag:    v2.7.0-beta

Merge branch 'w13_MDL-44661_m27_anon' of git://github.com/skodak/moodle

commit 5cff835bd677e8c16de00d6e8039c65965d3981c
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 19 Mar 2014 15:54:07 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-42892-master_42890' of git://github.com/ankitagarwal/moodle

commit 4158a6f5edf76756649e60aa12dfea31ef997ee9
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 19 Mar 2014 10:22:09 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43341' of git://github.com/nobelium/moodle

commit 4826ed1177c0d4c3d18b41525d6088150081a655
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 19 Mar 2014 09:49:00 +0800
Tag:    v2.7.0-beta

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

commit efd727063fbacc73eeae4b3218b56253607513e4
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Mar 2014 18:00:42 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-42892-master_42890' of git://github.com/ankitagarwal/moodle

commit aa1f1b75fbff0d8315bd24f2638dbf4ff12e58fa
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Mar 2014 17:39:40 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-38636-master' of git://github.com/roelmann/moodle

commit 3aa71904a1eac84f8e6e506861be796eaf118371
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Mar 2014 16:03:47 +0800
Tag:    v2.7.0-beta

Merge branch 'w12_MDL-44191_m27_mysql56' of git://github.com/skodak/moodle

commit 5a2286423498810a4ab60093a5689a87cce4f6fe
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Mar 2014 14:45:55 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44416' of git://github.com/appalachianstate/moodle

commit 09f019ddb18601dc6e3499e183f6bad12449acc1
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Mar 2014 14:33:17 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44148-master' of git://github.com/jethac/moodle

commit fabc88f0bb510886c4fee4d3b547d2b14622f16c
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Mar 2014 13:52:45 +0800
Tag:    v2.7.0-beta

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

commit e65825830fcc1a39a4f7344b185d2acd3369e458
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 18:18:36 +0800
Tag:    v2.7.0-beta

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

commit ea406e6b94968964f2307038b2c75afc088a04a0
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 18:12:16 +0800
Tag:    v2.7.0-beta

Merge branch 'w12_MDL-44624_m27_dmltest' of git://github.com/skodak/moodle

commit 9051b7f4ea2c698ae16601998c98ad3007cd8391
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 18:08:57 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44610-m' of git://github.com/micaherne/moodle

commit 3087d9d34eff279cc20e250fb314e7d698218007
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 17:53:00 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44650' of git://github.com/danielneis/moodle

commit 6f96d1a9a7618c53e180283464527768261c65f8
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 17:44:45 +0800
Tag:    v2.7.0-beta

Merge branch 'w12_MDL-41115_m27_emaillogin' of git://github.com/skodak/moodle

commit 9ceac20f74467e462853f651d2799372c1a0a53a
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 17:08:30 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44356-M27' of git://github.com/lazydaisy/moodle

commit c83a1da7d9b8dc22b0619f2a74b3da005f70207f
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 16:20:58 +0800
Tag:    v2.7.0-beta

Merge branch 'master_MDL-39568' of git://github.com/danmarsden/moodle

commit 93eab4fd77bb09081ab1ae7cd1a5bcc4531db74c
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 16:03:08 +0800
Tag:    v2.7.0-beta

Merge branch 'w12_MDL-43604_m27_mariadb10' of git://github.com/skodak/moodle

commit 4715639b22a842242a09bf4ea127ded76b9c26a4
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 14:38:01 +0800
Tag:    v2.7.0-beta

Merge branch 'w12_MDL-44603_m27_extgrade2' of git://github.com/skodak/moodle

commit 992d71cd8f0cf7e022988a45a237710addf085e3
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 14:32:28 +0800
Tag:    v2.7.0-beta

Merge branch 'w12_MDL-44500_m27_eventcourse' of git://github.com/skodak/moodle

commit 784d9c2be0ffe2bf6b0cd3c07b06943d0d5b94f2
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 14:30:03 +0800
Tag:    v2.7.0-beta

Merge branch 'w12_MDL-44635_m27_ajaxlogs' of git://github.com/skodak/moodle

commit 3b85de7b99954b100e08f13225ea1048ca7bf0ca
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 13:48:27 +0800
Tag:    v2.7.0-beta

Merge branch 'w12_MDL-44339_m27_testdebug' of git://github.com/skodak/moodle

commit b26329fd553fc3d7120b541f73226ac96893be9a
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 13:03:18 +0800
Tag:    v2.7.0-beta

Merge branch 'w12_MDL-44432_m27_logcron' of git://github.com/skodak/moodle

commit 72c9dda9fd820ca5610d5300755493033c89c231
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 11 Feb 2014 14:43:22 +0800
Tag:    v2.5.5

Merge branch '28567-25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE

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 c37c1c6c5d0eaec952f0e33d90498a5bf89c4af4
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 11 Feb 2014 14:42:23 +0800
Tag:    v2.7.0-beta

Merge branch '28567-27' of git://github.com/samhemelryk/moodle

commit 7480dbc5f2e7e4fc9cccafe387550c85cf2eb5a6
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 11 Feb 2014 14:13:39 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-42505-Feedback-Inappropriate-use-of-fieldset-tags-around-cancel-button' of git://github.com/michael-milette/moodle

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 396548fad465220bd5f7fd47ef095967bb5abe97
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 10 Feb 2014 18:15:57 +0800
Tag:    v2.7.0-beta

Merge branch '43977-27' of git://github.com/samhemelryk/moodle

commit d977433b7a52112a99e0228200358711db4f0393
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 05 Feb 2014 15:58:42 +0800
Tag:    v2.5.5

Merge branch 'MDL-42339_m25' of git://github.com/rwijaya/moodle into MOODLE_25_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 7f34b8e1351fed8476eb179c11d754997990727f
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 05 Feb 2014 15:56:30 +0800
Tag:    v2.7.0-beta

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

commit c71b7b7c4430594587557f9feaf1fb9755203e21
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 05 Feb 2014 12:49:02 +0800
Tag:    v2.7.0-beta

Merge branch '38923-27' of git://github.com/samhemelryk/moodle

commit e5fd05a36838dba3fa722d442a7abe60b0dbd13c
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 04 Feb 2014 15:44:51 +0800
Tag:    v2.7.0-beta

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

commit ccb30e1f7b3ea70f16f4d94d40222618490bdc06
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 17:35:17 +0800
Tag:    v2.5.5

Merge branch 'MDL-41647_25' of git://github.com/apsdehal/moodle into MOODLE_25_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 8621a0ece56830ad8aa31d941f53969c268da19c
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 17:34:20 +0800
Tag:    v2.7.0-beta

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

commit 1038bbb275c41af61c904b56daf0464ee2e833fb
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 16:10:17 +0800
Tag:    v2.5.5

Merge branch 'MDL-43805-25' of git://github.com/damyon/moodle into MOODLE_25_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 3ef6324aaa553a72c1acfe5185f6a7c312c4bc02
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 16:09:09 +0800
Tag:    v2.7.0-beta

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

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 c8e346f79940d836c9c6446023dcc236cd398757
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 15:17:18 +0800
Tag:    v2.7.0-beta

Merge branch 'w05_MDL-43905_m27_loginevents' of git://github.com/skodak/moodle

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 dc4bed906fcdbf586a01931470e710a47bebc77a
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 15:06:11 +0800
Tag:    v2.7.0-beta

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

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 367465085be54f466cb88b2b9b383f6a847de2fa
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 14:53:45 +0800
Tag:    v2.7.0-beta

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

commit 8c3470e3ce5412063ee68e328055cfa7b8fe4899
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 13:52:11 +0800
Tag:    v2.5.5

Merge branch 'MDL-43440-25' of git://github.com/mr-russ/moodle into MOODLE_25_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 1b066c06c6fe9e7b2882317a6275962f17ef2f6c
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 13:42:23 +0800
Tag:    v2.7.0-beta

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

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 c2a4d082a663064b017b471f63af33338904cb00
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 31 Jan 2014 14:11:15 +0800
Tag:    v2.5.5

Merge branch 'install_25_STABLE' of git://git.moodle.org/moodle-install into MOODLE_25_STABLE

commit 56ae2ba99bc7fbed689d351f72436c3bffe141f1
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 31 Jan 2014 14:11:11 +0800
Tag:    v2.7.0-beta

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

commit 7c4044a54f11df17f619487e6629bcc97ee533e3
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 29 Jan 2014 12:01:33 +0800
Tag:    v2.7.0-beta

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

commit 003638cb8d9e19b1bf17859f751a49d3dafe35c3
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 17 Dec 2013 13:44:36 +0800
Tag:    v2.4.8

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

commit f989165cb81d969c70c79fa55e47b02f02cd7777
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 17 Dec 2013 13:44:27 +0800
Tag:    v2.5.4

Merge branch 'MDL-37679-25' of git://github.com/phalacee/moodle into MOODLE_25_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 2280ad064da262e030b10c419be0838fbec15180
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 17 Dec 2013 13:37:19 +0800
Tag:    v2.7.0-beta

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

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 9cba0f89814ee30fc246f1fa384ddc3cc7864ed0
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 17 Dec 2013 13:35:31 +0800
Tag:    v2.7.0-beta

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

commit 6af74e102c515d090f057b97c9415fac780d9a1b
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 17 Dec 2013 08:24:46 +0800
Tag:    v2.4.8

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

commit 61f6209afa244fba5ae22c2cd2545da7b41c494f
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 17 Dec 2013 08:24:25 +0800
Tag:    v2.5.4

Merge branch 'MDL-41075-25' of git://github.com/mouneyrac/moodle into MOODLE_25_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 f3de94d340ed006e4f0c2faea566446616e02b93
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 17 Dec 2013 08:23:43 +0800
Tag:    v2.7.0-beta

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

commit 5df656cadd71249ea9b20f428dbb0fec48c17706
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 16 Dec 2013 09:29:19 +0800
Tag:    v2.4.8

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

commit 0ce9ea0df024d0e08690781088dd5021646c9e00
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 16 Dec 2013 09:28:55 +0800
Tag:    v2.5.4

Merge branch 'MDL-37972-25' of git://github.com/phalacee/moodle into MOODLE_25_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 2a73cfb011d7f04539a812baa133ef1556a2c0b6
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 16 Dec 2013 09:27:38 +0800
Tag:    v2.7.0-beta

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

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 bdd5a6c5c21a79b3aed3120810875dd9542a409d
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 12 Dec 2013 13:49:56 +0800
Tag:    v2.7.0-beta

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

commit a2712209f9296b91d6f1e144b0f4b4044260953c
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 12 Dec 2013 12:40:22 +0800
Tag:    v2.5.4

Merge branch 'mucupdates25' of https://github.com/skodak/moodle into MOODLE_25_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 10484ad5e452de946005869aa192c149fd308404
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 12 Dec 2013 12:39:14 +0800
Tag:    v2.7.0-beta

Merge branch 'mucupdates27' of https://github.com/skodak/moodle

commit 81ea8ce8b912d2d80b55a7ce4adc38923a8fcdda
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 11 Dec 2013 09:47:29 +0800
Tag:    v2.5.4

Merge branch 'MDL-43071-MOODLE_25_STABLE' of https://github.com/lucisgit/moodle into MOODLE_25_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 939aedfe3073aa8532afa97b4df1d707b9dc74db
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 11 Dec 2013 09:46:14 +0800
Tag:    v2.7.0-beta

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

commit e6a3977d3ec6708ff5aded59cba7d6444861b168
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 11 Dec 2013 08:48:31 +0800
Tag:    v2.5.4

Merge branch 'MDL-43258' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE

commit 8f3e0bf7a5ae85a78e9efe632b908733bcc6a2f7
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 12:20:22 +0800
Tag:    v2.7.0-beta

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

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 b3e0bd5225757832db6d4a61f2a7d88e3de296cf
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 12:15:27 +0800
Tag:    v2.7.0-beta

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

commit 143c8e7489114103301b1b7a947a6846e422ef1a
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 11:48:25 +0800
Tag:    v2.4.8

Merge branch 'm24_MDL-43082_IE9_Compat_View_SVG_Say_No' of https://github.com/scara/moodle into MOODLE_24_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 36d93b57e76476c889187ba16593f99d057c2ee1
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 11:47:20 +0800
Tag:    v2.5.4

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

commit e762d5a7f2b82d4bd0965c1229c5c3c51081e5df
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 11:47:08 +0800
Tag:    v2.7.0-beta

Merge branch 'm27_MDL-43082_IE9_Compat_View_SVG_Say_No' of https://github.com/scara/moodle

commit a98bdfa6685ac887f898934ed5025b313c0424dd
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 11:29:22 +0800
Tag:    v2.7.0-beta

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

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 3649bcfa21c5a9b5555d0b340946299ddde2ced1
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 11:25:24 +0800
Tag:    v2.7.0-beta

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

commit 10f476e3a5c5c3301fbc16c120f5b3693591dcb4
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 11:13:30 +0800
Tag:    v2.4.8

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

commit 930acdb3e99e871acd8eebb511dd01a0375d13ed
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 11:13:09 +0800
Tag:    v2.5.4

Merge branch 'MDL-43131_25' of git://github.com/timhunt/moodle into MOODLE_25_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 2cbcf496c26055d2fec811ebd201a37d497a35e9
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 11:10:04 +0800
Tag:    v2.7.0-beta

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

commit 78392c426effdae8a91cab6af1904f31d100b632
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 10:57:39 +0800
Tag:    v2.5.4

Merge branch 'mdl42487-moodle25' of https://github.com/tlock/moodle into MOODLE_25_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 11ca8227b11ef3f674e6828de1cc2fbcd776484c
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 10:56:49 +0800
Tag:    v2.7.0-beta

Merge branch 'mdl42487-master' of https://github.com/tlock/moodle

commit 013620aad30d792f1d5dada90af198716c1c0fff
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 08:40:54 +0800
Tag:    v2.7.0-beta

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

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 95971ae99ea950adc7e49b2a4e06513e5d53742d
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 15:54:53 +0800
Tag:    v2.7.0-beta

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

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 895d3050e0dc1e139d1a6a91a3f0430a213b2dce
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 15:45:27 +0800
Tag:    v2.7.0-beta

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

commit 53ca1f85fdd2a66d5c381286a731022e36e1d9f2
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 15:29:08 +0800
Tag:    v2.5.4

Merge branch 'w50_MDL-42973_m25_addonupd' of https://github.com/skodak/moodle into MOODLE_25_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 645cd2fe77c37ad710cddb8d0761f53946e1f5ba
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 15:26:39 +0800
Tag:    v2.7.0-beta

Merge branch 'w50_MDL-42973_m27_addonupd' of https://github.com/skodak/moodle

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 40d5757441a17241529aac600c14738c79999aa1
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 14:50:27 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43092_master' of git://github.com/lazydaisy/moodle

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 98a89047fb7d47ebbc0e90f88519e8110afa3c26
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 13:15:21 +0800
Tag:    v2.7.0-beta

Merge branch 'w50_MDL-43137_m27_openbasedir' of https://github.com/skodak/moodle

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 9f973b7bae739f91e1c3eabe41a6e6a9c04491e9
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 08:28:03 +0800
Tag:    v2.7.0-beta

Merge branch 'master_MDL-43192' of https://github.com/danmarsden/moodle

commit af76b176624ff5ecd4288c66c8a6ead6b536fb62
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 08:14:24 +0800
Tag:    v2.5.4

Merge branch 'wip-MDL-40213_M25' of git://github.com/gjb2048/moodle into MOODLE_25_STABLE

commit 3f189b5d493427670983eee2cd13fafbf239229e
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 08:13:16 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-MDL-40213_master' of git://github.com/gjb2048/moodle

commit ada23f968ae4508d5515476d47029933faf52ec2
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 08:03:30 +0800
Tag:    v2.4.8

Merge branch 'MDL-39618-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE

commit c5776576008e166b8659dc5c417193b022ff9e9b
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 20 Nov 2013 10:24:29 +0800
Tag:    v2.4.8

Merge branch 'MDL-42767-24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE

commit ccbd4e40c56fb15129ffb911636051729db0686d
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 20 Nov 2013 10:23:57 +0800
Tag:    v2.5.4

Merge branch 'MDL-42767-25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE

commit a99e1ad9ec5eb6bdbdaf364d5fd60c2e0d566690
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 20 Nov 2013 10:20:17 +0800
Tag:    v2.7.0-beta

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

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 61a9dd5cd949ddb035c6e0b8b7ed6401288b0782
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 13 Nov 2013 08:06:38 +0800
Tag:    v2.4.8

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

commit 96b5e3fc494367af7155bf5f175611788338a15e
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 13 Nov 2013 08:05:35 +0800
Tag:    v2.5.4

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

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 63d05b24d9956931acc094d3a8797ccdbf0a8575
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Nov 2013 12:11:41 +0800
Tag:    v2.5.4

Merge branch 'MDL-42276_m25' of https://github.com/markn86/moodle into MOODLE_25_STABLE

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 32ef8734a9d1a14ee9006af0df26f511ccbdadd6
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Nov 2013 11:50:08 +0800
Tag:    v2.4.8

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

commit 00be37804598c4025653a83e3f8ac2642bcef466
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Nov 2013 11:48:10 +0800
Tag:    v2.5.4

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

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 ce20ddf41a3bdf41aaa962ac3c0587f138bf3afd
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Nov 2013 08:24:07 +0800
Tag:    v2.5.4

Merge branch 'MDL-41775_25' of git://github.com/grabs/moodle into MOODLE_25_STABLE

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 42d72f3297d4370e440380e713795e44456e4bad
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 11 Nov 2013 18:11:29 +0800
Tag:    v2.4.8

Merge branch 'MDL-42043-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit af19ff0d79c2f5b078dd8bb7cc6563afc3460e79
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 11 Nov 2013 18:11:08 +0800
Tag:    v2.5.4

Merge branch 'MDL-42043-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

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 bc6f61fe9f43bc0025b8c0de3ad6cf1527df61cc
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 07 Nov 2013 13:31:39 +0800
Tag:    v2.4.7

Merge branch 'MDL-42697-24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE

commit a41b923702befd8621fe067481358db3fdd8228e
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 07 Nov 2013 13:31:22 +0800
Tag:    v2.5.3

Merge branch 'MDL-42697-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE

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 794f42d81d825de5a787ce5aeb4a497e5b37c057
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 06 Nov 2013 13:32:39 +0800
Tag:    v2.4.7

Merge branch 'MDL-42640-24' of https://github.com/colin-umn/moodle into MOODLE_24_STABLE

commit 36c9dadd675f29554e0507cb1c4ababcf3f19b81
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 06 Nov 2013 13:31:46 +0800
Tag:    v2.5.3

Merge branch 'MDL-42640-25' of https://github.com/colin-umn/moodle into MOODLE_25_STABLE

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 a78bb0cc831812d9963deb29f5b5bae473154d78
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 05 Nov 2013 14:45:38 +0800
Tag:    v2.4.7

Merge branch 'MDL-40267-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE

commit 5636172729676070eb119066fdfe57c668fdf138
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 05 Nov 2013 14:45:13 +0800
Tag:    v2.5.3

Merge branch 'MDL-40267-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

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 e2fb6ffa24e8ede31ced4c5fa0b9f64bae11e53c
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 16:17:08 +0800
Tag:    v2.4.7

Merge branch 'MDL-42604-24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE

commit bdb51186d75efd7e2f319bf5b3126c83ffaffc31
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 16:16:44 +0800
Tag:    v2.5.3

Merge branch 'MDL-42604-25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE

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 9ea075bb322f9fd2c55dbc6db11bfad5c8d88789
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 14:28:34 +0800
Tag:    v2.4.7

Merge branch 'MDL-42429_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE

commit a13c26eca36f747951e165199b50a1890cfbdb6b
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 14:28:15 +0800
Tag:    v2.5.3

Merge branch 'MDL-42429_m25' of https://github.com/markn86/moodle into MOODLE_25_STABLE

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 08839bbcb89c0d3ba97f06186f4c0e2e81870e59
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 14:23:31 +0800
Tag:    v2.4.7

Merge branch 'MDL-42566_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE

commit 7b6142193d6f736c1edb2d184e97df386274875d
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 14:23:12 +0800
Tag:    v2.5.3

Merge branch 'MDL-42566_m25' of https://github.com/markn86/moodle into MOODLE_25_STABLE

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 abfdce235b8a94600d7194c789d4304d79408875
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 13:58:26 +0800
Tag:    v2.4.7

Merge branch 'MDL-42465_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE

commit 01e7a7761958b70b34e0210058cf5c692893146a
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 13:58:11 +0800
Tag:    v2.5.3

Merge branch 'MDL-42465_m25' of https://github.com/markn86/moodle into MOODLE_25_STABLE

commit abaaa8cdae7b7c014b95dcc2c30bdb350b711345
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 13:15:13 +0800
Tag:    v2.4.7

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

commit c82257cc8846241d7c506c09afb7e2025cd21392
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 13:14:57 +0800
Tag:    v2.5.3

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

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 9312fbe16e8d8a591a61e673921ac5a536b78d93
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 12:19:00 +0800
Tag:    v2.4.7

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

commit b981f1b84711de254208d2e5276f4243779e7ef9
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 12:16:43 +0800
Tag:    v2.5.3

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

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 b3e58b7d0b097a4c3fe98eecacb0ef9a86aa569a
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 10:18:39 +0800
Tag:    v2.4.7

Merge branch 'MDL-42664-performance_measuring_filter_manager_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE

commit b5ba65ebf1255e361976d091a656986c80c33b98
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 10:18:15 +0800
Tag:    v2.5.3

Merge branch 'MDL-42664-performance_measuring_filter_manager_25' of git://github.com/mudrd8mz/moodle into MOODLE_25_STABLE

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 accfa102fe218579a3aaaa675a67b7a175573638
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 31 Oct 2013 19:20:20 +0800
Tag:    v2.4.7

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

commit 27fa761b1992d056d82b0002cb7c340e21462756
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 31 Oct 2013 19:17:58 +0800
Tag:    v2.5.3

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

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 91d309074f0c93ff81c41290c70f878ad91226d3
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 31 Oct 2013 18:17:28 +0800
Tag:    v2.4.7

Merge branch 'MDL-40971_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE

commit 42863ec241420e212683eeabbabd8da991ed11c6
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 31 Oct 2013 18:17:08 +0800
Tag:    v2.5.3

Merge branch 'MDL-40971_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE

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 609aa78de1dedc1c1255c276fbea5cc5d9bdbc7e
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 31 Oct 2013 13:00:16 +0800
Tag:    v2.5.3

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

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 94cc2c769cfa418c754d349246992586d5adf03c
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 24 Oct 2013 12:31:12 +0800
Tag:    v2.4.7

Merge branch 'MDL-35402_editor_rules_24' of git://github.com/davosmith/moodle into MOODLE_24_STABLE

commit a4b421c1fb8b06e4285ac52bcf1d541693b960f5
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 24 Oct 2013 12:29:57 +0800
Tag:    v2.5.3

Merge branch 'MDL-35402_editor_rules_25' of git://github.com/davosmith/moodle into MOODLE_25_STABLE

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 b46fc7cefd955af0d0c658fc763ce078a98c4c0c
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 24 Oct 2013 11:15:39 +0800
Tag:    v2.5.3

Merge branch 'MDL-41252-25' of git://github.com/mouneyrac/moodle into MOODLE_25_STABLE

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 e2536570a30f0b296e13170955cce82c8ccd9298
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Oct 2013 07:18:47 +0800
Tag:    v2.4.7

Merge branch 'w43_MDL-37813_m24_filterall' of https://github.com/skodak/moodle into MOODLE_24_STABLE

commit 538e06f2b5ff424ee33edb39ffb4f711fa3e3dbf
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Oct 2013 07:17:58 +0800
Tag:    v2.5.3

Merge branch 'w43_MDL-37813_m25_filterall' of https://github.com/skodak/moodle into MOODLE_25_STABLE

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 a70c9434d7d9b812dece648eff577f6619b5cf13
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 22 Oct 2013 12:04:25 +0800
Tag:    v2.4.7

Merge branch 'MDL-26170_rss_24' of https://github.com/andyjdavis/moodle into MOODLE_24_STABLE

commit 265b16589dd75d45c99c97c9aa8d5f45d1715fa5
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 22 Oct 2013 12:04:12 +0800
Tag:    v2.5.3

Merge branch 'MDL-26170_rss_25' of https://github.com/andyjdavis/moodle into MOODLE_25_STABLE

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 f311ba2714994edf07db9646735c6fd8eb18118c
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 22 Oct 2013 11:35:09 +0800
Tag:    v2.4.7

Merge branch 'MDL-24380-24' of git://github.com/mouneyrac/moodle into MOODLE_24_STABLE

commit b2108d99550f15f0499e466920dfda369e8bd09d
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 22 Oct 2013 11:34:53 +0800
Tag:    v2.5.3

Merge branch 'MDL-24380-25' of git://github.com/mouneyrac/moodle into MOODLE_25_STABLE

commit 06032cd9280835c5dac7f383e25b275241519094
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 22 Oct 2013 11:09:05 +0800
Tag:    v2.4.7

Merge branch 'MDL-42239-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE

commit 575ec94611f8fbec732a0d1a10e85dddfed1e692
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 22 Oct 2013 11:08:45 +0800
Tag:    v2.5.3

Merge branch 'MDL-42239-m25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE

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 a322a0ab53aa4423a204a1ff587c54cfed2a3ae4
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 21 Oct 2013 13:00:53 +0800
Tag:    v2.4.7

Merge branch 'w43_MDL-42386_m24_etag' of https://github.com/skodak/moodle into MOODLE_24_STABLE

commit 10ae2a6d0e0b956140f552ae97918e91b1f6d22d
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 21 Oct 2013 13:00:27 +0800
Tag:    v2.5.3

Merge branch 'w43_MDL-42386_m25_etag' of https://github.com/skodak/moodle into MOODLE_25_STABLE

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 d2ff78d1736a30a578e5281a03310f9fb140ba25
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 15 Oct 2013 11:11:58 +0800
Tag:    v2.4.7

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

commit 071ac9ffddbd2d39a0dc6eb6dfdf1513082bd26f
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 15 Oct 2013 11:11:40 +0800
Tag:    v2.5.3

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

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 7bd19d562dce619a3ec52974e1e7a3c418e0b28f
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 10 Oct 2013 09:53:27 +0800
Tag:    v2.4.7

Merge branch 'MDL-37153_24' of https://github.com/pauln/moodle into MOODLE_24_STABLE

commit dd70b2b84adf35e999ea72280e061508ac40d6cf
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 10 Oct 2013 09:53:04 +0800
Tag:    v2.5.3

Merge branch 'MDL-37153_25' of https://github.com/pauln/moodle into MOODLE_25_STABLE

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 b159b572078819f2a54867b1e0664b4efdb398e6
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Oct 2013 09:04:12 +0800
Tag:    v2.4.7

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

commit 573ceb9459e96f72359a557fc09e3b71eb74305c
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Oct 2013 09:03:48 +0800
Tag:    v2.5.3

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

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 d7788d69f63fced62782069e4680099c688417df
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Oct 2013 18:49:41 +0800
Tag:    v2.4.7

Merge branch 'MDL-32592-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE

commit 31f1464297b8c278bd1ecb905a38d429d1f91137
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Oct 2013 18:49:29 +0800
Tag:    v2.5.3

Merge branch 'MDL-32592-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

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 a033a6b4c1eb3a286e1fc92658d16a0a8fb851fe
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Oct 2013 18:44:07 +0800
Tag:    v2.4.7

Merge branch 'MDL-39653-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE

commit e4f0750a1287e5185b87a41531ffccd7421683d2
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Oct 2013 18:43:25 +0800
Tag:    v2.5.3

Merge branch 'MDL-39653-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

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 29d526b49558968b263e5a1e0ac83b65bc4f0e29
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 30 Sep 2013 14:11:44 +0800
Tag:    v2.4.7

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

commit d23f108197f1a24188ce7927825537c82a428ca4
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 30 Sep 2013 14:10:48 +0800
Tag:    v2.5.3

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

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 9573950b9d7ba4d83edf79c54ce5ae6fe7aaa81a
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 27 Sep 2013 12:51:14 +0800
Tag:    v2.5.3

Merge branch 'install_25_STABLE' of git://git.moodle.org/moodle-install into MOODLE_25_STABLE

commit 06450ed3985fc21888c100a51eaddb16e6d3108a
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 27 Sep 2013 12:49:38 +0800
Tag:    v2.4.7

Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE

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 90336898da2ab4e84cc29d02af07ef7786f82be0
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Sep 2013 19:43:18 +0800
Tag:    v2.5.3

Merge branch 'MDL-40550_25' of https://github.com/totara/openbadges into MOODLE_25_STABLE

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 8492c192afbea22859a81eb6190da69efa8396d0
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Sep 2013 19:33:12 +0800
Tag:    v2.4.7

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

commit 0184a31bad4ab8e9599fe8da394e156b5f67a812
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Sep 2013 19:32:35 +0800
Tag:    v2.5.3

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

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 b0124c9703280038b67ccc8c221c2bb1bada9ea2
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 23 Sep 2013 17:18:05 +0800
Tag:    v2.4.7

Merge branch 'MDL-41833-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE

commit 1537f8241eb0b74bb63c32d6c0f13ac2e52ec49e
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 23 Sep 2013 17:17:34 +0800
Tag:    v2.5.3

Merge branch 'MDL-41833-m25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE

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 47ba8d481e4748065c11fe4fe376f326f746db57
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 23 Sep 2013 12:41:22 +0800
Tag:    v2.4.7

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

commit 30f43b0e9cd1b44a681e2f6b447e997a360969c7
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 23 Sep 2013 12:40:35 +0800
Tag:    v2.5.3

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

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 eca39eaeee431794148a2909cc1174268fe4f6a3
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 16 Sep 2013 13:32:45 +0800
Tag:    v2.5.3

Merge branch 'MDL-41315-25' of git://github.com/damyon/moodle into MOODLE_25_STABLE

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 b4b50810d4641546b3946e3b519ca20d1f9daeb2
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 06 Aug 2013 12:40:45 +0800
Tag:    v2.4.6

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

commit 71699c5a8104100c0e667af82a4fad1f3064d388
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 06 Aug 2013 12:39:26 +0800
Tag:    v2.5.2

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

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 ebb5c53b514fb405c8a3f778a97475957f44da4a
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 15:17:33 +0800
Tag:    v2.4.6

Merge branch 'MDL-36011-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE

commit 0b1723fd577ec2310cc5754a9ceaa007904833e9
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 15:16:47 +0800
Tag:    v2.5.2

Merge branch 'MDL-36011-25' of git://github.com/damyon/moodle into MOODLE_25_STABLE

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 93334057de0d1a0a9870840b6b5333379e5bd880
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 11:53:35 +0800
Tag:    v2.4.6

Merge branch 'MDL-30852-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE

commit 25dcfa6f5400a3b17139a746239be43535bd724c
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 11:52:38 +0800
Tag:    v2.5.2

Merge branch 'MDL-30852-25' of git://github.com/damyon/moodle into MOODLE_25_STABLE

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 a4bd80565f42bc61dc6d9f580183473ba1c5e2b3
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 11:16:34 +0800
Tag:    v2.5.2

Merge branch 'MDL-40825_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

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 153cb0b4c326cb0e125beb6a9e4787d1127d7082
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 10:31:53 +0800
Tag:    v2.5.2

Merge branch 'MDL-40320-m25' of git://github.com/sammarshallou/moodle into MOODLE_25_STABLE

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 ac23d64400883163724c9e532418692d947cf2c8
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 10:21:56 +0800
Tag:    v2.4.6

Merge branch 'MDL-35981-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE

commit 2adfb6528edaeb1db44e2bc2e212f4b9ab2bfbcd
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 10:20:40 +0800
Tag:    v2.5.2

Merge branch 'MDL-35981-25' of git://github.com/damyon/moodle into MOODLE_25_STABLE

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 e8a943e3610724214e40e511b268a1b11e6bec42
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 08:49:32 +0800
Tag:    v2.5.2

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

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 89478f00cdb1abe13c187c729ae7c2aea3958827
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 17 Jul 2013 10:47:43 +0800
Tag:    v2.4.6

Merge branch 'MDL-40701-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE

commit d11977ebc91ba3fd7cb4bf75f72a85af03e5eea6
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 17 Jul 2013 10:46:26 +0800
Tag:    v2.5.2

Merge branch 'MDL-40701-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

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 18cf2255f0d85f9972c15c71505de52b52d7c4f4
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 16 Jul 2013 14:12:40 +0800
Tag:    v2.4.6

Merge branch 'MDL-35851-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE

commit 996d7754571dce7937ed5d492c9350312890f77f
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 16 Jul 2013 14:11:29 +0800
Tag:    v2.5.2

Merge branch 'MDL-35851-25' of git://github.com/damyon/moodle into MOODLE_25_STABLE

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 da4a51d096ff27f965f75c924af9d372fe393319
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 16 Jul 2013 12:33:24 +0800
Tag:    v2.5.2

Merge branch 'MDL-39812_bootstrapbase_m25' of git://github.com/rwijaya/moodle into MOODLE_25_STABLE

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 35dc874292e6b6a4dfe6f81d074cea20c7fe3ca6
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 15 Jul 2013 12:45:22 +0800
Tag:    v2.4.6

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

commit 2500fc57d0b1d037225183385dc9e22b652bf206
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 15 Jul 2013 12:44:22 +0800
Tag:    v2.5.2

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

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 c291dd69ea467c7ae11d07b6580d5fc758dc62dd
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 15 Jul 2013 10:53:02 +0800
Tag:    v2.4.6

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

commit eccf42d9d987e97fa3cd191ede59d0b4f31d8dec
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 15 Jul 2013 10:42:57 +0800
Tag:    v2.5.2

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

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 537d8f8a58d1b155d0fcbaa01c269b0a8f8f0afc
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 14:26:59 +0800
Tag:    v2.4.6

Merge branch 'MDL-38366-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit 63c8f25b1bea72379ec4c4a311f09c629fd4a7b0
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 14:25:38 +0800
Tag:    v2.5.2

Merge branch 'MDL-38366-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

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 8d296ea5e4c6787efd10eff767780d8a5fbec575
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 10:05:16 +0800
Tag:    v2.3.9

Merge branch 'm23_MDL-39832_Fix_Chrome_Issues_ETag_XSendfile_2ndRound' of https://github.com/scara/moodle into MOODLE_23_STABLE

commit 114c924d9463719c2ff6ca151bd3c7fd178c9ec8
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 10:03:57 +0800
Tag:    v2.4.6

Merge branch 'm24_MDL-39832_Fix_Chrome_Issues_ETag_XSendfile_2ndRound' of https://github.com/scara/moodle into MOODLE_24_STABLE

commit 0f2a0a3fb0c3cff4edbd3a8f759683a782df8a95
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 10:01:29 +0800
Tag:    v2.5.2

Merge branch 'm25_MDL-39832_Fix_Chrome_Issues_ETag_XSendfile_2ndRound' of https://github.com/scara/moodle into MOODLE_25_STABLE

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 4d8ff7c8e27301a366954ba2fa271e45ad7f673b
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 09:09:44 +0800
Tag:    v2.5.2

Merge branch 'w28_MDL-40488_m25_admin' of https://github.com/skodak/moodle into MOODLE_25_STABLE

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 ed79029f0ecd2ba581b24dd42bbb1f3ca9301621
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 08:03:44 +0800
Tag:    v2.4.6

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

commit 512ab8e262ea094d88f21dad73c6b6fde375530c
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 08:02:53 +0800
Tag:    v2.5.2

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

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 1b0951a26a24b7e872c17bb3b87f01952527f1a6
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Jul 2013 19:36:12 +0800
Tag:    v2.5.2

Merge branch 'MDL-40472-25' of git://github.com/damyon/moodle into MOODLE_25_STABLE

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 82043201ea9434a48177194dbe0b9b5e4d1e6fdd
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Jul 2013 14:34:28 +0800
Tag:    v2.5.2

Merge branch 'MDL-39020-m25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE

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 be9cd2ff26135ea1de063d0c73938ba62f708573
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Jul 2013 09:33:20 +0800
Tag:    v2.4.6

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

commit 33025649f3292e14e99f32f71bc754fb7739b53e
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Jul 2013 09:31:52 +0800
Tag:    v2.5.2

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

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 319b3293676e9fd4ab4f2cf0f7ff9598d9db3f8c
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 13:41:36 +0800
Tag:    v2.3.8

Merge branch 'MDL-40207-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit bebd6a6cef3701fbfbbfdf33c83d3ec8d95c37ee
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 13:39:55 +0800
Tag:    v2.4.5

Merge branch 'MDL-40207-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE

commit 8526be5612f57b6b8a1984182ff4e7f5b15e6c86
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 13:38:20 +0800
Tag:    v2.5.1

Merge branch 'MDL-40207-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

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 272105604abe0098db0729dcb36b831f32cc81b1
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 12:13:10 +0800
Tag:    v2.4.5

Merge branch 'MDL-39650-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit 3ad26c86eb6185b93ccde89acfafbf6b1f99cffa
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 12:11:54 +0800
Tag:    v2.3.8

Merge branch 'MDL-39650-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

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 4d7c173514a63cba8acfb63feed89db9142cb829
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 10:57:06 +0800
Tag:    v2.5.1

Merge branch 'MDL-40165-m25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE

commit 2e6cc99352bb278f176ea1db0fd58ad938253feb
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 10:56:20 +0800
Tag:    v2.4.5

Merge branch 'MDL-40165-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE

commit ade9bbc32e162b4bf76a71c52cd591902cc09121
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 10:54:40 +0800
Tag:    v2.3.8

Merge branch 'MDL-40165-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE

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 30b38ce4fa3b41789e9475812db867497d30224e
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 09:15:54 +0800
Tag:    v2.3.8

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

commit af06f5def546ada7ed021b2af2858a7335d52c66
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 09:14:52 +0800
Tag:    v2.4.5

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

commit 04597742cf5d4fbc22085433398eb9053868eeb0
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 09:13:26 +0800
Tag:    v2.5.1

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

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 29a45089300d62cd8586eebf7ab6fbfdf192a6ae
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Jun 2013 08:40:39 +0800
Tag:    v2.5.1

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

commit 37d38a3125d752135d5d790d15b689faeaed652d
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 14 Jun 2013 11:50:50 +0800
Tag:    v2.5.1

Merge branch 'install_25_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_25_STABLE

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

commit d5bba86435a48140c0c7e13707ba758224d38f4e
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 11 Jun 2013 10:12:36 +0800
Tag:    v2.3.8

Merge branch 'MDL-39412_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 351f4729e2f722488850deba39157f79e6aec877
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 11 Jun 2013 10:02:01 +0800
Tag:    v2.4.5

Merge branch 'MDL-39412_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit 55711b0a0d25b48037930fd2e4195556ff08db33
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 21 May 2012 18:17:25 +0800
Tag:    v2.3.0-beta

Merge pull request #4 from mudrd8mz/wip-files23-fixes