Git merges in Moodle 2.6.x by Damyon Wiese

commit b9d8d54be26f4745a616e76933e411b37aa9b2f4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 06 Mar 2014 09:22:13 +0800
Tag:    v2.6.2

Merge branch 'wip-MDL-44403-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

commit 6b1e9b0cd41be8b7dd947112978baab2256140bb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 05 Mar 2014 14:51:18 +0800
Tag:    v2.6.2

Merge branch 'MDL-43635-m26' of https://github.com/brentboghosian/moodle2 into MOODLE_26_STABLE

commit abfc156859280149d46c4f93a337b3158b31d8b7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 05 Mar 2014 14:00:57 +0800
Tag:    v2.6.2

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

commit c6465439d0e7223be45ef304e7892e5ecbccf2bf
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 05 Mar 2014 09:58:54 +0800
Tag:    v2.6.2

Merge branch 'wip-MDL-44074-M26_4' of git://github.com/gjb2048/moodle into MOODLE_26_STABLE

commit 0fc189a4b46b7b4abc5cb3e264753bc452221c6c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 04 Mar 2014 13:28:18 +0800
Tag:    v2.6.2

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

commit a97718eaede07b828fcc11a69203d41a774de4d5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 28 Feb 2014 10:02:41 +0800
Tag:    v2.6.2

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

commit b174b543d8f3c2115fe006859cc913d301ce2727
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 25 Feb 2014 16:44:48 +0800
Tag:    v2.6.2

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

commit 0e0bbd9922d684c79cff5c3da7fa28656f066cbc
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 25 Feb 2014 11:04:40 +0800
Tag:    v2.6.2

Merge branch 'wip-MDL-40619-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

commit 7c9f70acd46f8ad45c79cb57e045e6ce9a33589d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 16:56:21 +0800
Tag:    v2.6.2

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

commit 5f98c897b4888a870174310d14f3b64cf01e371d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 15:40:28 +0800
Tag:    v2.6.2

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

commit 9334d950094766ef2aa057beaf5b0862b435a5b4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 15:22:42 +0800
Tag:    v2.6.2

Merge branch 'wip-MDL-44168_26' of git://github.com/ds125v/moodle into MOODLE_26_STABLE

commit ede0d157653a499f2b723191cb22d855abb8fa4a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 14:30:08 +0800
Tag:    v2.6.2

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

commit ff7b9d9d8f677ed5ef33773923712e70a5d1d1ac
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 13:38:33 +0800
Tag:    v2.6.2

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

commit 1998e85cf1852a71872035ca4dda6db7460bf3b8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 13:33:42 +0800
Tag:    v2.6.2

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

commit e2f19c6b33ab77a6a298afd64463f495f84317ff
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 13:27:45 +0800
Tag:    v2.6.2

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

commit ebe9c36cb52f21e82adbc7abbdf7097f11441295
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 11:14:05 +0800
Tag:    v2.6.2

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

commit 24d6ab75fccc7442552dd428164fd2f95adb4068
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 11:09:57 +0800
Tag:    v2.6.2

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

commit 41a10883b604d6ade3f8296a390044042823fadf
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 10:41:25 +0800
Tag:    v2.6.2

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

commit 5e9d6beaa303b1148ac12d3eb5a62c3ab62cde9e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 19 Feb 2014 09:20:07 +0800
Tag:    v2.6.2

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

commit 28ac492db33e9549992bde9d888690ff88f2cef3
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 18 Feb 2014 14:05:32 +0800
Tag:    v2.6.2

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

commit fa0016a8a2627614f2a57ab3b12aeccace8d9e4e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 18 Feb 2014 12:41:42 +0800
Tag:    v2.6.2

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

commit 590a9dc30a91fba5b3959171f2667589352e52eb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 17 Feb 2014 14:35:36 +0800
Tag:    v2.6.2

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

commit 31ab685057339cb2d84500c03ecd2c82b51a928f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 17 Feb 2014 14:23:40 +0800
Tag:    v2.6.2

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

commit 759e616eb6e48483098631ccbe34ab592590e041
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 17 Feb 2014 09:21:46 +0800
Tag:    v2.6.2

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

commit eef0d3043cac4031fc0d9e08f0ab9e43d916bc2e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 21 Jan 2014 13:55:49 +0800
Tag:    v2.6.2

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

commit 9717c4b19c9b49a2d901e21fabcd1bb501dbf777
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 21 Jan 2014 09:37:04 +0800
Tag:    v2.6.2

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

commit d6d18a2b7b2d6cab26312f718184d18649cd36a9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 21 Jan 2014 09:29:40 +0800
Tag:    v2.6.2

Merge branch 'MDL-43732_m26' of github.com:merrill-oakland/moodle into MOODLE_26_STABLE

commit e35e70f83d0c13510e63b2b00de5c894ed396008
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 Jan 2014 13:21:34 +0800
Tag:    v2.6.2

Merge branch 'MDL-42495-m26' of git://github.com/micaherne/moodle into MOODLE_26_STABLE

commit b53af0f2a6300bc5ccfee7be2eb0a22f934e95c7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 Jan 2014 11:29:21 +0800
Tag:    v2.6.2

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

commit 5b860c69a2e6df4a7d10721b2bce577355a89f78
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 Jan 2014 10:56:34 +0800
Tag:    v2.6.2

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

commit df25d333798cc8f9ccbbc7cbb24e79195ea7fa3a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 Jan 2014 10:13:54 +0800
Tag:    v2.6.2

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

commit 5af6a32866fc7fa5f03c4698dcd7ba547d0192ee
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 15 Jan 2014 13:30:58 +0800
Tag:    v2.6.2

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

commit f5d810b4f33bd3a02a2bb2a6d9ec20a591d5486b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 15 Jan 2014 09:38:46 +0800
Tag:    v2.6.2

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

commit 7b0e78bf836eedfea7997529d29cebd6756964dd
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 Jan 2014 14:29:34 +0800
Tag:    v2.6.2

Merge branch 'w02_MDL-43511_m26_bankcache' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 24607ba326e8ff8a077d0f42f47b7fecab3f6dee
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 Jan 2014 14:05:27 +0800
Tag:    v2.6.2

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

commit eb8f1fef79a1d1ed614f9a11400407ab775014c1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 Jan 2014 13:33:30 +0800
Tag:    v2.6.2

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

commit 5a0cf2cda045ca7e06d184503e9aba5845a501d2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 Jan 2014 13:18:35 +0800
Tag:    v2.6.2

Merge branch 'w02_MDL-43488_m26_signreq' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 020705cca08e81a6eb7baf9ebc0fde35de26d25d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 Jan 2014 12:37:17 +0800
Tag:    v2.6.2

Merge branch 'MDL-43610-m26' of git://github.com/micaherne/moodle into MOODLE_26_STABLE

commit 8aaad0d2b6bce7bc42dd9d1b25d16a56a723823e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 10 Jan 2014 14:20:52 +0800
Tag:    v2.6.1

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

commit 708e0804b8affa9ccdb00db5b2ca36475cc89daf
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 Jan 2014 13:33:53 +0800
Tag:    v2.6.1

Merge branch 'w01_MDL-43585_m26_userlib' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 3a8e16ecabe64d5294e390b24c3bf53ed3f5addd
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 Jan 2014 12:52:49 +0800
Tag:    v2.6.1

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

commit 28abbabae537d441230b184aac4e6c5cf34b71c1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 Jan 2014 09:22:15 +0800
Tag:    v2.6.1

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

commit 9ce83d090862fe2d116a6f4eb9aed63be63b5504
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 Jan 2014 16:14:02 +0800
Tag:    v2.6.1

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

commit 0f399f7f74e3fab5ed82e9fd8f52e3ffb8da7aa9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 Jan 2014 15:52:17 +0800
Tag:    v2.6.1

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

commit 5726fe62639b591b6dcd6fa7d820d3f185720739
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 Jan 2014 14:51:16 +0800
Tag:    v2.6.1

Merge branch 'w01_MDL-36721_m26_passlog' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 996c1d5b1577218c7085ef69a75b93fb4f67109e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 20 Dec 2013 11:58:07 +0800
Tag:    v2.6.1

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

commit cb891e57f0fcf557ae4f7a6d761b3380608f5352
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 17:29:57 +0800
Tag:    v2.6.1

Merge branch 'wip-MDL-42731-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

commit 4e14b95f0ee3178ae6af3de94a10556291ce7c22
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 16:29:39 +0800
Tag:    v2.6.1

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

commit 4d32c0c6d0f4f7a71c8541bfec3a3871d839e632
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 16:12:08 +0800
Tag:    v2.6.1

Merge branch 'wip-MDL-43026-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

commit e2a2209ed6ddb7cd3e41efef3928318871aecc1c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 11:43:53 +0800
Tag:    v2.6.1

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

commit 1cf504414d7682533893bfeb4c709940389b7999
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 11:25:36 +0800
Tag:    v2.6.1

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

commit 88c5d93aa1fdd4b3b6003781268858e9bab3adb0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 02 Dec 2013 14:37:03 +0800
Tag:    v2.6.1

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

commit 39177fd3a7f41fa0178036d60eded23fdd98fa58
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 02 Dec 2013 11:23:23 +0800
Tag:    v2.6.1

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

commit 2f6a01e094d36803a5961f7e496fc57e8a11716f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 02 Dec 2013 09:51:08 +0800
Tag:    v2.6.1

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

commit 1e9c117f503c9c6948468b4992bd6443b9817bcc
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Nov 2013 16:59:04 +0800
Tag:    v2.6.1

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

commit 5f9aa41321188c420ab49cc9d3c471e1f8db0feb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Nov 2013 09:33:36 +0800
Tag:    v2.6.1

Merge branch 'wip-MDL-40850-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

commit a1554ea241b9bebce4194c2656b1fba268f195e4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Nov 2013 14:02:30 +0800
Tag:    v2.6.1

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

commit 025bd122a61ac56350f3fe6bb1345e40c0f3d0a0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Nov 2013 13:16:37 +0800
Tag:    v2.6.1

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

commit c3208c17d1d382ea934eed542bdbe48864a7a99a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Nov 2013 12:30:23 +0800
Tag:    v2.6.1

Merge branch 'MDL-42913a-26' of https://github.com/srynot4sale/moodle into MOODLE_26_STABLE

commit 49d367d47e3e491bc84e21676bfd0626e3971b18
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Nov 2013 09:50:49 +0800
Tag:    v2.6.1

Merge branch 'm26_MDL-40223' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE

commit 52454bedeea415045d9c7c438ee2f414d4769392
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Nov 2013 16:08:31 +0800
Tag:    v2.6.1

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

commit 02e45bf2695ec71370ed160086d1df1ad976a875
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Nov 2013 15:27:22 +0800
Tag:    v2.6.1

Merge branch 'MDL-42808-master' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE

commit 28fccc09ce23ab2199fbf0f16638c7c7c0ecc84a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Nov 2013 15:21:01 +0800
Tag:    v2.6.1

Merge branch 'm26_MDL-41695' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE

commit d29a7827c4c422623f58501a0b4148e0abac49bf
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Nov 2013 14:04:23 +0800
Tag:    v2.6.1

Merge branch 'm26_MDL-40223' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE

commit f2f23af955d89dad13e5c83f18f2675955430f3d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 14 Nov 2013 17:18:44 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42711-master' of git://github.com/nebgor/moodle

commit e4af9616c3335d1804ee44d1be8dffb2d2c4cad9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 13 Nov 2013 16:57:34 +0800
Tag:    v2.6.0-rc1

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

commit 6bce5b846a42faa4d20928d0f4c55f447fd84b7e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 13 Nov 2013 15:57:07 +0800
Tag:    v2.6.0-rc1

Merge branch 'wip-MDL-42833-master' of git://github.com/marinaglancy/moodle

commit b22292ed50bef899fe0703a3bdb441609d7ddade
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 13 Nov 2013 14:42:32 +0800
Tag:    v2.6.0-rc1

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

commit 34b67813ece9b485954000e0ed1bfd05f7f12d36
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 13 Nov 2013 13:43:52 +0800
Tag:    v2.6.0-rc1

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

commit 2034716c164fcffb47f7dddc332617d6763f9688
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 13 Nov 2013 13:10:42 +0800
Tag:    v2.6.0-rc1

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

commit f51d0384f70a59bbc34481be5cbfac5a3bc97329
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 13 Nov 2013 11:50:36 +0800
Tag:    v2.6.0-rc1

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

commit 3ebaeb11b07414aa4a19b7c0e3871d7f482c7a77
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Nov 2013 15:11:25 +0800
Tag:    v2.6.0-rc1

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

commit a6b35417c0587eb8e137a0ad50082dc6e8cb07ce
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Nov 2013 14:22:28 +0800
Tag:    v2.6.0-rc1

Merge branch 'w46_MDL-42503_m26_stringfilters' of https://github.com/skodak/moodle

commit fae2e1ffcc206cc334a90d4b59845b6c151d14f9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Nov 2013 10:02:09 +0800
Tag:    v2.6.0-rc1

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

commit 2d764047ca81f0af249bc15288170aab5fbb7bc1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Nov 2013 17:25:30 +0800
Tag:    v2.6.0-rc1

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

commit 16fafb9aed4893e614d12bb532cadd0f69075658
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Nov 2013 17:16:51 +0800
Tag:    v2.6.0-rc1

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

commit bbdb36986823be76e5d66ec4752ffd2d516973ff
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Nov 2013 10:41:40 +0800
Tag:    v2.6.0-rc1

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

commit d5c0f0453ce823fb188e03079d4d1df024bb0210
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Nov 2013 10:17:07 +0800
Tag:    v2.6.0-rc1

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

commit 75a4dd38ad68e27230f9a9a4ce9732bf06e881bc
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Nov 2013 09:57:36 +0800
Tag:    v2.6.0-rc1

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

commit e3552170da68b0c63bd1a5366df01209645db804
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 08 Nov 2013 16:15:17 +0800
Tag:    v2.6.0-rc1

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

commit 16fd6fb6d7fd5635c576d40d74c4f86f4a73f729
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 08 Nov 2013 11:43:10 +0800
Tag:    v2.6.0-rc1

Merge branch 'w46_MDL-42769_m26_admineditor' of https://github.com/skodak/moodle

commit 13f04e7c910d5a7eb04ec19df8d7fd4ead9a7e83
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 08 Nov 2013 11:23:00 +0800
Tag:    v2.6.0-rc1

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

commit d25e988d0821210f8b82c0d05f2ffa77a14d828b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 08 Nov 2013 08:45:11 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-40975-editinstructions' of git://github.com/andrewnicols/moodle

commit a79cea102d0863175d09e2132ccf27924f449289
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 07 Nov 2013 16:20:53 +0800
Tag:    v2.6.0-rc1

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

commit 81b07e655c5a017bfa41b15d7969fd6bc8a4ebb8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 07 Nov 2013 12:23:25 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-40975-overflow' of git://github.com/andrewnicols/moodle

commit dcd02d8b0e082c4f6ef657b26e5f26e419c2083a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 06 Nov 2013 16:42:11 +0800
Tag:    v2.6.0-rc1

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

commit 30e736cfbaf3b699c97dbe5fe678a754c3444bab
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 06 Nov 2013 16:07:44 +0800
Tag:    v2.6.0-rc1

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

commit 2c366f45cafa07bff41f2218a399999f45414f68
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 06 Nov 2013 16:00:33 +0800
Tag:    v2.6.0-rc1

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

commit 496422e34c9a26543a6ba7c9a87ae29a52e15881
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 06 Nov 2013 15:37:29 +0800
Tag:    v2.6.0-rc1

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

commit 951b414b658d55f76f774feeddd778d0fb2e7a85
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 06 Nov 2013 13:06:01 +0800
Tag:    v2.6.0-rc1

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

commit ee8e077a2e19ecd5c15d3bb0e825617a71aeede4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 06 Nov 2013 12:07:47 +0800
Tag:    v2.6.0-rc1

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

commit ac3831b422b6f015c4b4049de9ff2c6e5a763b67
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 06 Nov 2013 11:59:41 +0800
Tag:    v2.6.0-rc1

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

commit 7fd16ca1fd51ef3f34d880748946364d6757fa1b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 06 Nov 2013 10:21:35 +0800
Tag:    v2.6.0-rc1

Merge branch 'w45_MDL-42602_m26_userloginevent' of https://github.com/skodak/moodle

commit c5ae81ca38b3690ef9715ec35485a5bdafb0c55c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Nov 2013 22:44:53 +0800
Tag:    v2.6.0-rc1

Merge branch 'wip-MDL-38228-master' of git://github.com/marinaglancy/moodle

commit 9e16402727e10fbe241b42fcd0a6b0b14be260fc
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Nov 2013 14:04:08 +0800
Tag:    v2.6.0-rc1

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

commit 057a79922e0d7da37b9d4092f7b6875776ad4041
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Nov 2013 13:10:52 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42701' of git://github.com/stronk7/moodle

commit 97c7b8a5483dc4e13602a1bc1619438632c7df35
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Nov 2013 12:24:41 +0800
Tag:    v2.6.0-rc1

Merge branch 'wip-mdl-42703-master' of https://github.com/deraadt/moodle

commit 1ddbe7815d0d7344d48f93073252ddccf0149dd4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Nov 2013 11:06:23 +0800
Tag:    v2.6.0-rc1

Merge branch 'wip-MDL-42318-master' of https://github.com/marinaglancy/moodle

commit 9995aa3852475e261fc28671326e880a8bd1068b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Nov 2013 09:31:41 +0800
Tag:    v2.6.0-rc1

Merge branch 'w45_MDL-42512_m26_filtermess' of https://github.com/skodak/moodle

commit b50bd4bcad2d8bd5f5157fbcbec1cbd0f1a16b62
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 16:44:54 +0800
Tag:    v2.6.0-rc1

Merge branch 'w45_MDL-42525_m26_plugininfoperf' of https://github.com/skodak/moodle

commit f6015bbf0203f68a423784f13bc822889dc7343d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 15:22:43 +0800
Tag:    v2.6.0-rc1

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

commit e45910aff34e21ec240d892390ea0ef3adc98f67
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 13:17:15 +0800
Tag:    v2.6.0-rc1

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

commit d04bea30dae4de244e0fbdba2602791eda198d91
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 13:11:42 +0800
Tag:    v2.6.0-rc1

Merge branch 'wip-MDL-42400-master' of git://github.com/marinaglancy/moodle

commit 42fb49ae0b0c2bcf793a8ff8f751cf667e3b1756
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 11:53:40 +0800
Tag:    v2.6.0-rc1

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

commit 6178bb2091dd92697c09b2e02ef3a21db7bffb6d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 11:33:04 +0800
Tag:    v2.6.0-rc1

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

commit f859f6b4e6ead40322ba9132eb414e0d1d4127ff
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 10:56:12 +0800
Tag:    v2.6.0-rc1

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

commit 0d0b93ce2fa8dfac6feadc00a5249f54183ed302
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 10:49:06 +0800
Tag:    v2.6.0-rc1

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

commit b804196502b783d31407ba3f68bb775fb5f2af32
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 10:37:59 +0800
Tag:    v2.6.0-rc1

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

commit 23cd687d72632edbcd58846a8204d6a750278c7b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 09:38:38 +0800
Tag:    v2.6.0-rc1

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

commit f21531eb77caf05e9598f449f775072ce302bd50
Author: Damyon Wiese <damyon@moodle.com>
Date:   Sat, 02 Nov 2013 22:39:37 +0800
Tag:    v2.6.0-rc1

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

commit 6ff3923ba85937c817194f7c1b8ec77c5300c6f1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Sat, 02 Nov 2013 22:34:16 +0800
Tag:    v2.6.0-rc1

Merge branch 'w45_MDL-42497_m26_orphanedplugins' of https://github.com/skodak/moodle

commit e0c14e5018b9a94150e9c43ebc4e64629c6b130a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Sat, 02 Nov 2013 22:24:19 +0800
Tag:    v2.6.0-rc1

Merge branch 'w45_MDL-42387_m26_filelifetime' of https://github.com/skodak/moodle

commit e9a20b470323776d29ba43d955ae12b7a351a235
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 01 Nov 2013 21:31:57 +0800
Tag:    v2.6.0-rc1

Merge branch 'wip-MDL-28463-master' of git://github.com/marinaglancy/moodle

commit 3b4e5a83f4796af0805ad80ee2ab5d0a706fc043
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 30 Oct 2013 17:21:00 +0800
Tag:    v2.6.0-rc1

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

commit bb1a6000462dbdd6fd963fed67b07aa20acc8bae
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 30 Oct 2013 16:21:37 +0800
Tag:    v2.6.0-rc1

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

commit 574c1699a7851758f35b1fb45b003bf2d5e3e320
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 30 Oct 2013 15:44:13 +0800
Tag:    v2.6.0-rc1

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

commit 3b4ace3ec88491dc99576e951fccf380cb7ed74c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 30 Oct 2013 12:08:20 +0800
Tag:    v2.6.0-rc1

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

commit 6df3cf52c5bd52e0ed1fea77ff8be2e682d1d3a2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 30 Oct 2013 11:38:30 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42579_m26_2' of git://github.com/sbourget/moodle

commit da13302f918f959586322fc4922bb639a29e8164
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 30 Oct 2013 10:31:08 +0800
Tag:    v2.6.0-rc1

Merge branch 'wip-MDL-41337-master' of git://github.com/marinaglancy/moodle

commit e17bac441d1a5d5c7c704c8111f876a7cfc14154
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 29 Oct 2013 16:42:48 +0800
Tag:    v2.6.0-rc1

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

commit 5fb9161b5e66438ce5ed18226a2fb3462e1baa81
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 29 Oct 2013 13:57:51 +0800
Tag:    v2.6.0-rc1

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

commit afb5f285cdae8c1fa408b7d707cd59f0693f8e8d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 29 Oct 2013 13:44:34 +0800
Tag:    v2.6.0-rc1

Merge branch 'm26_MDL-39810_IE_Compatibility_View_Does_Not_Recognize_JSON_RFC4627_MIME_Type' of https://github.com/scara/moodle

commit 9a84376d4b8e6e8f15bcddc1bc79b4577cd656b2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 28 Oct 2013 12:39:30 +0800
Tag:    v2.6.0-rc1

Merge branch 'w44_MDL-42110_m26_addoninstaller' of https://github.com/skodak/moodle

commit 3a335789261cbc490fb9c58270ccf7900b98ef76
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 28 Oct 2013 12:11:34 +0800
Tag:    v2.6.0-rc1

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

commit 042e6a47fde715b042acef8d432e170beaf225e8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 28 Oct 2013 10:52:41 +0800
Tag:    v2.6.0-rc1

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

commit 76f8eb9be955b5d50aa1a7fa0e08dad7600514ba
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 24 Oct 2013 10:29:05 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-40976-behat-fix' of git://github.com/dmonllao/moodle

commit 19becd541aa84435bd06d6266281a65b908847ff
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 23 Oct 2013 14:06:04 +0800
Tag:    v2.6.0-rc1

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

commit db812f5e5abf3680dc113cfad4dc0e74a7cfbd73
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 23 Oct 2013 13:37:24 +0800
Tag:    v2.6.0-rc1

Merge branch 'w43_MDL-42208_m26_authunmask' of https://github.com/skodak/moodle

commit 549ce3fa76fa280b43930e0334fb8df23ef13d8d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 23 Oct 2013 11:50:50 +0800
Tag:    v2.6.0-rc1

Merge branch 'wip-mdl-41339' of https://github.com/jennymgray/moodle

commit 22889692695f4730443fba60dab42dee17e75eff
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 16 Oct 2013 15:45:40 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-42065_master' of https://github.com/sam-moodle/moodle

commit fc69508f0112288852b0e3e5628ebc4193e9445e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 16 Oct 2013 12:45:07 +0800
Tag:    v2.6.0-beta

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

commit 2ec214806f84d4683da62149724416a7360b245c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 16 Oct 2013 11:36:16 +0800
Tag:    v2.6.0-beta

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

commit 2c94d858f06eda8740129d6a6f1a387ad2be260d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 15 Oct 2013 16:54:40 +0800
Tag:    v2.6.0-beta

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

commit 6350e5df45632394dbf0897e48070d932d898f5b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 14 Oct 2013 16:55:39 +0800
Tag:    v2.6.0-beta

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

commit 35d7ba167a30365dafc31cd95988ac6d063a3b6e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 14 Oct 2013 16:14:38 +0800
Tag:    v2.6.0-beta

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

commit 7aeb2cc335d5ac074f6dcb34508f4cf44b2d8f80
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 14 Oct 2013 15:12:17 +0800
Tag:    v2.6.0-beta

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

commit 3abdd3273b8a18c6e1542cd0c4a4b1be9671e15e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 14 Oct 2013 15:07:29 +0800
Tag:    v2.6.0-beta

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

commit 769b434ad9d86955695a03fae717a94569f6e81a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 14 Oct 2013 15:04:46 +0800
Tag:    v2.6.0-beta

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

commit 71c2e40993ae6ef1c68e124da4fce2283bb49e93
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 14 Oct 2013 14:50:53 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-42187_master' of git://github.com/kordan/moodle

commit 48947db1143c6859a1d966e76e4c802449b7c3ed
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 14 Oct 2013 14:29:52 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-34586-master' of https://github.com/mackensen/moodle

commit 031a28ce7f0abb1e47395f0c7e4284b6874137b7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 14 Oct 2013 14:12:57 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-34612-master' of https://github.com/mackensen/moodle

commit e6338c2c65019fee71d4321e3fe569e78b6cb21d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 14 Oct 2013 14:02:34 +0800
Tag:    v2.6.0-beta

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

commit 36f60b226d3ec533d7a6ed20368d8bb186b9537c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 14 Oct 2013 13:02:55 +0800
Tag:    v2.6.0-beta

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

commit e4fc57eca598c0507f7b0f2cdb28edfa64891b09
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 11 Oct 2013 16:33:17 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41792_intmaster' of https://github.com/markn86/moodle

commit 835a006b070c669352ecfee0c528c8183a24112e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 10 Oct 2013 14:04:47 +0800
Tag:    v2.6.0-beta

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

commit 982482f01a4408dc1b738664fb0dbfc4bbf5c577
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 10 Oct 2013 11:11:12 +0800
Tag:    v2.6.0-beta

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

commit 370058d8fb9316a391b9cf15b375c64469ee794e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 10 Oct 2013 10:49:11 +0800
Tag:    v2.6.0-beta

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

commit f0ae8d7a6608ee466f8995c51ad89d2a62703d7d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 10 Oct 2013 09:31:33 +0800
Tag:    v2.6.0-beta

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

commit 80d5b253e2b45aeca0cb659adbd0eab42bdf0234
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 10 Oct 2013 09:11:25 +0800
Tag:    v2.6.0-beta

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

commit c7780855507e3b00bf93313df0839ab6cce21e8a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 09 Oct 2013 14:42:23 +0800
Tag:    v2.6.0-beta

Merge branch 'w41_MDL-42047_m26_cohortdel' of https://github.com/skodak/moodle

commit 46008531289768d9e169fda4c98cd65e3dc30599
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 09 Oct 2013 13:30:40 +0800
Tag:    v2.6.0-beta

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

commit 6412c972e3a4ff8fdaffda5141d8d63964e32a12
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 09 Oct 2013 12:46:14 +0800
Tag:    v2.6.0-beta

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

commit c2a2580ac9ccbe6f7b4c215cc6f8603f25ae5e1d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 09 Oct 2013 12:09:10 +0800
Tag:    v2.6.0-beta

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

commit 5cc2c6662d242b5f4f6249b5fc9f004b4a70dfc9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 09 Oct 2013 12:03:54 +0800
Tag:    v2.6.0-beta

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

commit 604fc45ee0baad885f7126f7d5451f4126feb12e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 09 Oct 2013 11:48:14 +0800
Tag:    v2.6.0-beta

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

commit 869dd1fc6c3b832c6535390ab8e84003b520b678
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 09 Oct 2013 09:39:09 +0800
Tag:    v2.6.0-beta

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

commit 7bfc69b0c2d15b38c0e962d64d8653528fc79339
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 08 Oct 2013 16:19:25 +0800
Tag:    v2.6.0-beta

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

commit 44585a1ecde51cbb2fd8a45ec9afae9e0e7e5554
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 08 Oct 2013 16:03:46 +0800
Tag:    v2.6.0-beta

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

commit 6abc1738772521007b626d41b0fb66bf984fca4e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 08 Oct 2013 14:43:14 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41520-master-mod_lti-completion-view' of github.com:Trii/moodle

commit 43822d89c58653d73101ebeb9af3a213757ae29c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 08 Oct 2013 13:47:49 +0800
Tag:    v2.6.0-beta

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

commit b242214269b9bb2917df4c63720507fb11e45801
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 08 Oct 2013 12:48:10 +0800
Tag:    v2.6.0-beta

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

commit 944cfe1dec9f0a9e409dc5fad009ab912b4bfb79
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 08 Oct 2013 12:45:43 +0800
Tag:    v2.6.0-beta

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

commit 18ef6201c0c7475a8db5dea8d10a52a2c63196c6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 08 Oct 2013 10:30:57 +0800
Tag:    v2.6.0-beta

Merge branch 'passwordreset-2013-10-07-1031Z' of https://github.com/peterbulmer/moodle

commit d4770c9f0011f35389b9a0ba36ef02f53366fd79
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 07 Oct 2013 15:28:45 +0800
Tag:    v2.6.0-beta

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

commit fa8b1fa4a4b592056938110735205bd867f19f23
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 11 Sep 2013 16:55:13 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-37028-fix2' of git://github.com/marinaglancy/moodle

commit b10ce368065dd31c5057a20333ff2676354a4b58
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Sep 2013 13:48:01 +0800
Tag:    v2.6.0-beta

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

commit f1f4a860c65ad1926465683a17eff7170bfd1163
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Sep 2013 13:33:27 +0800
Tag:    v2.6.0-beta

Merge branch 'w37_MDL-41408_m26_loginredirect' of https://github.com/skodak/moodle

commit 6aca3fc4192d968edfd4c1df26bf1331b7d6f1c6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Sep 2013 12:56:40 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-mdl-23335-master' of https://github.com/deraadt/moodle

commit 4fae13bb5ec9136b4467261140704183aa3ed7ed
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Sep 2013 12:51:33 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-37028-master' of git://github.com/marinaglancy/moodle

commit 603913bcbb5146156c235eeb36d3f7d9300bfb76
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Sep 2013 12:21:20 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41497-master' of https://github.com/willylee/moodle

commit cc93ed2698eb0d4b565a138f5293217a0ed729ce
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Sep 2013 11:59:29 +0800
Tag:    v2.6.0-beta

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

commit b4c6b42eb65af2485be7470876519e76497246a6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Sep 2013 09:39:06 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-40347-master' of git://github.com/marinaglancy/moodle

commit d0eaa8bf493030d4ef82068163d125d744d86410
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Sep 2013 09:30:56 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41626-master' of github.com:StudiUM/moodle

commit 934c70040c0a891d9382d4b1ee8f278ceded02ad
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Sep 2013 09:03:42 +0800
Tag:    v2.6.0-beta

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

commit 426cdef0bc20743961f8c6b8c12a25dc42958718
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 09 Sep 2013 12:43:32 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-41517-master' of git://github.com/marinaglancy/moodle

commit 7bb89ae04299ad63b96e54812db48ead485461d1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 09 Sep 2013 10:46:59 +0800
Tag:    v2.6.0-beta

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

commit 1320c3177b1f5065669c24a87bce38d45957c46a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 09 Sep 2013 10:41:12 +0800
Tag:    v2.6.0-beta

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

commit fedb0325df1b832d3cdeb81c0fdb8ad896a8c770
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 04 Sep 2013 12:24:54 +0800
Tag:    v2.6.0-beta

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

commit 3516b82c9d175781c1dd5b9014f4438af4be6b58
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 04 Sep 2013 11:45:07 +0800
Tag:    v2.6.0-beta

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

commit 8a4796fbcdc2266d84af84676b4ec73effa04a6a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 04 Sep 2013 09:00:48 +0800
Tag:    v2.6.0-beta

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

commit be62e59a938401dfc0abb40558285476fc14e798
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 16:18:36 +0800
Tag:    v2.6.0-beta

Merge branch 'mdl26_MDL-41403_backup_reduce_memory_usage' of https://github.com/brki/moodle

commit 050167c3e6f9a947732620582348096f9070a34b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 16:09:29 +0800
Tag:    v2.6.0-beta

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

commit e66c84a1572575bbffcad3355bed448f58075a41
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 16:02:47 +0800
Tag:    v2.6.0-beta

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

commit a28f43e8c7c2ba3b01064bc2bb7cc5b0fe62e9fd
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 15:33:25 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-23044-master' of git://github.com/marinaglancy/moodle

commit 9591f9bc54f817294d134aaa035364df2beb6553
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 15:16:42 +0800
Tag:    v2.6.0-beta

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

commit ca83aa0b99c904fd5881f06994a771be13c25d68
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 14:49:42 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-37564' of https://github.com/nebgor/moodle

commit ed204cb51426e538313f4fd1e6f9733a79496144
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 14:35:58 +0800
Tag:    v2.6.0-beta

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

commit 060615d3476ee45fcbf88d84e9d8d5b264d3785f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 14:25:43 +0800
Tag:    v2.6.0-beta

Merge branch 'm26_MDL-29218_plugin_init_not_blocking_when_false' of https://github.com/scara/moodle

commit 3e248a7dc8c974d96a0360f9c4c8f4e51a8a3a06
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 14:13:00 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-32690_restoreMissingAssignment_master' of https://github.com/moodlerooms/moodle

commit 8a1b820bc58a86ed804ef6fbfb723e5837cca392
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 09:35:16 +0800
Tag:    v2.6.0-beta

Merge branch 'w36_MDL-20045_m26_customlevels' of https://github.com/skodak/moodle

commit 80032fea02c71a3fa60ce134dc0f6f8f67621d09
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 02 Sep 2013 15:26:26 +0800
Tag:    v2.6.0-beta

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

commit c932a4db7c9b87dabda628376a1c0ac82873e8fc
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 02 Sep 2013 15:02:12 +0800
Tag:    v2.6.0-beta

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

commit fb692af13b2b24b2cdbc080548adb1abf84d0519
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 02 Sep 2013 14:56:49 +0800
Tag:    v2.6.0-beta

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

commit 771d17fbab771b8b16b8c475f6357b83864430a6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 28 Aug 2013 17:06:07 +0800
Tag:    v2.6.0-beta

Merge branch 'w35_MDL-41245_m26_pluginuninstall' of https://github.com/skodak/moodle

commit 5df7c45409caf9f0ea703ce34943372105572f2f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 16:31:36 +0800
Tag:    v2.6.0-beta

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

commit ad4f3b6ce576c90df634697fed182bbfffa13f43
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 16:06:32 +0800
Tag:    v2.6.0-beta

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

commit e3f3475079112b8ad78dd16c833f3ef52a97cae2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 15:55:14 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-41127-master' of git://github.com/marinaglancy/moodle

commit 8380bd08a87010d21fcc2561d5780dbcc4ef0e4d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 15:51:19 +0800
Tag:    v2.6.0-beta

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

commit cbd91e23e9917b9f8ee92e9dc4c81dbf03d49e55
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 15:29:49 +0800
Tag:    v2.6.0-beta

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

commit 37e2954e19b5a2a37e39429298152608136b5d9f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 15:09:21 +0800
Tag:    v2.6.0-beta

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

commit dc7092f7b348316c46b288620ab922152f18269a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 14:11:03 +0800
Tag:    v2.6.0-beta

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

commit f5a791ee7aabb20229bc12d92f4c8f6474c80deb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 13:36:38 +0800
Tag:    v2.6.0-beta

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

commit f6c2af867fd106990bd6d648a1b68a8610c4a9b2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 13:16:55 +0800
Tag:    v2.6.0-beta

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

commit 92058753ace96bdbf67572ff9103ed0e1cdce4d3
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 12:46:23 +0800
Tag:    v2.6.0-beta

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

commit 7316f46a23d83c7a0352cb7f8b33717aa75b58c9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 12:27:47 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40447_master' of https://github.com/nadavkav/moodle

commit 58e6ac1e9a8d2840b9a6298d9d557aa31bf947f1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 12:23:16 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40752_master' of https://github.com/nadavkav/moodle

commit 37bb910633133180d0dcdaacf69d4a4ea4f3df2b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 10:07:07 +0800
Tag:    v2.6.0-beta

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

commit 9e179acfd36e9a32399407823ba0718a2ad797f3
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 26 Aug 2013 16:00:35 +0800
Tag:    v2.6.0-beta

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

commit 5db088a3cb779ed773651a5f0cd79e8c8c581891
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 26 Aug 2013 13:59:51 +0800
Tag:    v2.6.0-beta

Merge branch 'w35_MDL-41245_m26_pluginuninstall' of https://github.com/skodak/moodle

commit 1b9db0af41d414c89042b8eeeac4fbd1d7846a07
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 26 Aug 2013 13:50:20 +0800
Tag:    v2.6.0-beta

Merge branch 'mdl26_MDL-29004_wiki-fix-images-in-printer-friendly-view' of https://github.com/brki/moodle

commit 97c91725d1b02d4dcffe1b28828525f87f08bf1e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 26 Aug 2013 12:42:15 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41380-master' of https://github.com/mr-russ/moodle

commit 2d55bee19166fea93024a6de6168f8a8e1c634e1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 26 Aug 2013 09:43:06 +0800
Tag:    v2.6.0-beta

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

commit 8920b2e288a307776f47a96623ea022d19b2df73
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 26 Aug 2013 09:27:57 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-36803-m' of https://github.com/andrewnicols/moodle

commit 50cb89177e4e4253a07c8fa91f3212303cc6a1eb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 22 Aug 2013 11:19:55 +0800
Tag:    v2.6.0-beta

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

commit 52ec2a60f60ad8e10d7ebb8d007ecea90bc03d1b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 21 Aug 2013 15:43:23 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41191-duplicaterecords' of git://github.com/danpoltawski/moodle

commit 1f1bee6fbf512289e0a1b7b26597207bf1579b3d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 21 Aug 2013 14:05:13 +0800
Tag:    v2.6.0-beta

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

commit 90a5a4b620f90b65595aa1f2119219998abda767
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 21 Aug 2013 11:38:37 +0800
Tag:    v2.6.0-beta

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

commit 89959d9ad158e31fb62d49ba6bf93786dad9caeb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 16:45:33 +0800
Tag:    v2.6.0-beta

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

commit e2f36a71a83e4c802a0634e79e59f5b6c876edc5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 16:13:55 +0800
Tag:    v2.6.0-beta

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

commit 93e2c2a567b17314c532f89010e6a7eeee06a810
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 16:10:49 +0800
Tag:    v2.6.0-beta

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

commit a446d62d977c133f18e23d7be7c3747408bd84cc
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 16:01:12 +0800
Tag:    v2.6.0-beta

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

commit 57cef30e42eed974e01819d058609f73ce240a49
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 15:51:57 +0800
Tag:    v2.6.0-beta

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

commit 531110c8905cd964739d4754e66b6523d7dab51f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 15:22:34 +0800
Tag:    v2.6.0-beta

Merge branch 'w33_MDL-41112_m26_cachedist' of https://github.com/skodak/moodle

commit 6f81158a7e4a2b24e8a8c75f2ea58aa407839db5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 14:45:34 +0800
Tag:    v2.6.0-beta

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

commit 5a10d2a7ae0d87b4517fd994ddb2519e28a52f01
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 14:40:42 +0800
Tag:    v2.6.0-beta

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

commit eedb6aae3fdefae48ea1f0a6669912712745c92d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 13:31:16 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-27595-2' of https://github.com/bostelm/moodle

commit 43cc62ed139f29d5a526044dd541958f6d006b68
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 12:55:31 +0800
Tag:    v2.6.0-beta

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

commit 5a2356be38204bfe8a62a7a11d3db8ce5faf3cf8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 12:28:00 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41122_master' of git://github.com/kastashov/moodle

commit b277230aadc917693d9c03871e001ea5ad535daf
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 12:21:04 +0800
Tag:    v2.6.0-beta

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

commit e5cb7f8b7b560cf1d804c7853aad012d9a04d02e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 Aug 2013 15:42:17 +0800
Tag:    v2.6.0-beta

Merge branch 'master_MDL-39572' of https://github.com/totara/moodle

commit 26ae471585d43e7af404cf8235d50c84a4865150
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 Aug 2013 15:38:23 +0800
Tag:    v2.6.0-beta

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

commit 3415e1ca59795b03683807efbab79b3db4351419
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 Aug 2013 13:50:46 +0800
Tag:    v2.6.0-beta

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

commit d51f9d5fd044a4389c1fd5f59e0f64437ce725e2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 Aug 2013 13:29:55 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-36789-master' of git://github.com/marinaglancy/moodle

commit 0b92270b197b826fd142e3c42bb70335cc22b2b9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 23 Jul 2013 16:04:50 +0800
Tag:    v2.6.0-beta

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

commit 0070cb8bca5d75ba91087a44ace14d0a195f4032
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 23 Jul 2013 15:51:59 +0800
Tag:    v2.6.0-beta

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

commit 6064e5cc006de79535b5ace1a97ec5a8029c3b67
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 23 Jul 2013 14:49:42 +0800
Tag:    v2.6.0-beta

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

commit 7ea41b4a94da069855821586a7466370c02c826d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 23 Jul 2013 14:16:31 +0800
Tag:    v2.6.0-beta

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

commit 9ced78bd3ec8050f969d1ec4758ebcdca04ffde2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 23 Jul 2013 10:37:20 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-40648-master' of git://github.com/marinaglancy/moodle

commit e3a96804effb15cbe6b444a8ef9e20ea8f5e91fb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 22 Jul 2013 16:09:29 +0800
Tag:    v2.6.0-beta

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

commit bbc8485708b32afb21619d841a5f1bc271179912
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 22 Jul 2013 16:00:41 +0800
Tag:    v2.6.0-beta

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

commit c31909cb69f050ba6492291d04e1b98d24dedd6f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 22 Jul 2013 15:05:53 +0800
Tag:    v2.6.0-beta

Merge branch 'w30_MDL-39846_m26_event2' of https://github.com/skodak/moodle

commit 91313e43ca7201e12609e1479ad599a955ab60e9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 22 Jul 2013 12:11:43 +0800
Tag:    v2.6.0-beta

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

commit c39423139d7be51f1640712d6705181205b6254f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 22 Jul 2013 11:47:21 +0800
Tag:    v2.6.0-beta

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

commit e4ef98006fca94c1015ba0f0c4fe95798facffe7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 19 Jul 2013 09:19:29 +0800
Tag:    v2.6.0-beta

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

commit 1d1f7ac81f9bba304b24629b21cf232c29d6ccd9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 21:59:47 +0800
Tag:    v2.6.0-beta

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

commit 3fd74243a741e7240ba3e47135fa7a92cb5aea1e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 21:51:19 +0800
Tag:    v2.6.0-beta

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

commit 820ad5dfd87f1f42132a4d0a0a9bbda62d98b715
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 21:35:38 +0800
Tag:    v2.6.0-beta

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

commit b30a12db52b2060427b57746362f7ac08f76c127
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 21:29:58 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-40621-master' of git://github.com/marinaglancy/moodle

commit 59e649180d5649fb277ea54171725d563b7a2594
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 21:23:30 +0800
Tag:    v2.6.0-beta

Merge branch 'w29_MDL-40574_m26_editordelete' of https://github.com/skodak/moodle

commit e202521f2534684275ac50b22a6ccf8fa293b809
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 20:59:41 +0800
Tag:    v2.6.0-beta

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

commit 259e3c25250077c8cc3953f7a82a5d87e761aa2d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 15:44:38 +0800
Tag:    v2.6.0-beta

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

commit 924ea4845ab771a82e9c9e7f09075e3417c885ed
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 15:14:49 +0800
Tag:    v2.6.0-beta

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

commit 06c8b60936f4d3bc5a41c8feaa01d1bae2ae2019
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 15:00:46 +0800
Tag:    v2.6.0-beta

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

commit ed9e492087dc445c39a87a652741edf311044c88
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 14:49:25 +0800
Tag:    v2.6.0-beta

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

commit d981272e64b81a46259d3c1a8061d6ad96132e27
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 13:33:27 +0800
Tag:    v2.6.0-beta

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

commit 539819dc40012b429062ae8726c780cf9a386ead
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 13:28:52 +0800
Tag:    v2.6.0-beta

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

commit 6ec1f2f2ebef58fe351806b700c0348257d676c5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 13:25:54 +0800
Tag:    v2.6.0-beta

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

commit 8eb3e1f94f9463708f8b652f012c5ad5931e2b68
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 11:28:57 +0800
Tag:    v2.6.0-beta

Merge branch 'w29_MDL-40558_m26_guestdelete' of https://github.com/skodak/moodle

commit 2f9aeafe5ecab89c68477358dc409e2137ff9c75
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 11:24:06 +0800
Tag:    v2.6.0-beta

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

commit 4d4fb80d8fe27bbf572c65a174c57e9d88079241
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 11:02:54 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40538' of https://github.com/mr-russ/moodle

commit 4d4b938fa3143ea4d29fdd0e59146306cd2cc20f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 15 Jul 2013 14:54:20 +0800
Tag:    v2.6.0-beta

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

commit d7bf5fd1f73d76c06785b7e83c930184bf11d86b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 15 Jul 2013 14:42:10 +0800
Tag:    v2.6.0-beta

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

commit fff9752d2aa7c23ae33d0a040df4eae2a97439d4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 15 Jul 2013 11:54:24 +0800
Tag:    v2.6.0-beta

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

commit c49fea3be50d5cda6cd84025e21da199c969715e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 15 Jul 2013 11:25:37 +0800
Tag:    v2.6.0-beta

Merge branch 'w29_MDL-40435_m26_componentpermissions' of https://github.com/skodak/moodle

commit 527b24b104364f53d41fd6595792e62c18a651c6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 15 Jul 2013 10:58:03 +0800
Tag:    v2.6.0-beta

Merge branch 'w29_MDL-40475_m26_componentcache' of https://github.com/skodak/moodle

commit 5034db3e9f460136c0350cd09a05bf9142928105
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 15 Jul 2013 09:55:44 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-40658-master' of git://github.com/marinaglancy/moodle

commit 779545e7fda125e378ed0e3a797bf1358b6829de
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 12 Jul 2013 09:41:55 +0800
Tag:    v2.6.0-beta

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

commit c6df1f5ad0b21cce0843071d0a56f7fec56ba94e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 22:43:54 +0800
Tag:    v2.6.0-beta

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

commit 57cf73a8255fd165d6106576897f7125b14d5d16
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 22:28:51 +0800
Tag:    v2.6.0-beta

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

commit e9319545589243ea453ae56715afd3092fe9f850
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 21:51:41 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40392' of git://github.com/stronk7/moodle

commit ef5fd5bf4044fcf0ef94bac7b0f1692009071f4f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 16:05:02 +0800
Tag:    v2.6.0-beta

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

commit a6673a8b04357456adb12b0808e95c30fcba9750
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 15:28:31 +0800
Tag:    v2.6.0-beta

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

commit bc90ad107ae07c3c90b2e0e4ac1868083d3079c5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 15:20:07 +0800
Tag:    v2.6.0-beta

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

commit de0a6ed45994aa99be89a0672794c22f44dbaa4c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 15:15:47 +0800
Tag:    v2.6.0-beta

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

commit 8a011a9f0a472a5c0e6c7060104db698ba49e84e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 13:44:01 +0800
Tag:    v2.6.0-beta

Merge branch 'w28_MDL-40243_m26_ldapsuspend' of https://github.com/skodak/moodle

commit c2bee5e0d13179dddeb84176be4b6a96372efd60
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 13:33:42 +0800
Tag:    v2.6.0-beta

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

commit eb729e0391f56c909dc3cf8a76dfc9257091c145
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 13:26:49 +0800
Tag:    v2.6.0-beta

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

commit 26616e4b6ddf50dfde7b89d0b9ce7a0efaf73988
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 12:34:31 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40386' of https://github.com/prateeksachan/moodle

commit 9d871499fe08017ec3c6c02b199b9aba60de8716
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 11:11:42 +0800
Tag:    v2.6.0-beta

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

commit 9ac5809512478717685d472e92bcf3e1e7ccb557
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 11:04:58 +0800
Tag:    v2.6.0-beta

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

commit 35a8f0cb7762cdb555554167a42d57150e309e48
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 10:48:47 +0800
Tag:    v2.6.0-beta

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

commit b080d5b6882b1dde5b446768a4b9257a1ce55345
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 10:03:22 +0800
Tag:    v2.6.0-beta

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

commit 15b726d584e77bc7279195c338f824b2e6bad924
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 08 Jul 2013 22:28:21 +0800
Tag:    v2.6.0-beta

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

commit 64830bf658763b096dd891cb4b0028c1decd8f64
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 08 Jul 2013 15:10:58 +0800
Tag:    v2.6.0-beta

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

commit 3536560eff32a61a35021a2330d028c9a2754bc8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 08 Jul 2013 13:40:09 +0800
Tag:    v2.6.0-beta

Merge branch 'w28_MDL-40415_m26_opcache' of https://github.com/skodak/moodle

commit 24e13d4283909a6f4018b35efa08c8c805f167ab
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 03 Jul 2013 11:35:53 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39813_login' of git://github.com/andyjdavis/moodle

commit f48f4827d1837464feb69f4318ca5ef7915c4356
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 02 Jul 2013 15:23:38 +0800
Tag:    v2.6.0-beta

Merge branch 'w27_MDL-40299_m26_textlib' of https://github.com/skodak/moodle

commit 1fd351c207e3545dea8b0ad92f43acfffb993a04
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 02 Jul 2013 14:28:46 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-40353-master' of git://github.com/marinaglancy/moodle

commit a57885a651679ef8f09659725f2354d0fcb6be1c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 02 Jul 2013 11:00:33 +0800
Tag:    v2.6.0-beta

Merge branch 'w27_MDL-26943_m26_localsubplugins' of https://github.com/skodak/moodle

commit 455d2042017c7e8b12aee27e0acdf29201c37e7a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 30 May 2013 11:25:54 +0800
Tag:    v2.6.0-beta

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

commit e750fcc4daa55598161505f67ed60f9470ea12e3
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 28 May 2013 11:13:43 +0800
Tag:    v2.6.0-beta

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

commit 0f1f60136858622778ef1012f4d7cb9c7ac83943
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 28 May 2013 11:12:43 +0800
Tag:    v2.6.0-beta

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

commit cb7c21af807519dc697ce4453e61e1eb650e95c2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 28 May 2013 09:57:15 +0800
Tag:    v2.6.0-beta

Merge branch 'w22_MDL-39802_m26_deletedusers' of git://github.com/skodak/moodle

commit e6302a3c759c95edf0a2452a1aa114f5d9359d99
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 27 May 2013 16:29:00 +0800
Tag:    v2.6.0-beta

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

commit 1833a3c4494b037050252c97ded3de0296fd5948
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 27 May 2013 16:24:34 +0800
Tag:    v2.6.0-beta

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

commit d059d80ea681b5db2e673b57782d490a578f60a0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 27 May 2013 16:15:51 +0800
Tag:    v2.6.0-beta

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

commit c0db7cbe50c389f04fb9f5d1117955b12be5d368
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 24 May 2013 13:10:53 +0800
Tag:    v2.6.0-beta

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

commit 49125bc5095cb651be710830ccba743d86ed460f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 22 May 2013 09:06:29 +0800
Tag:    v2.6.0-beta

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

commit b346553fda6aeb60b33cc55ddcd3252d28004e08
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 May 2013 16:11:59 +0800
Tag:    v2.6.0-beta

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

commit e872912d1c15ce8552fab654895341503a6901f5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 May 2013 12:12:23 +0800
Tag:    v2.6.0-beta

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

commit e8dc568b1271722241c6b792d9843f8942ca9c80
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 May 2013 12:03:36 +0800
Tag:    v2.6.0-beta

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

commit 2d1ad229da73844136b6a79a133b326c28246b67
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 17 May 2013 11:36:09 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-28250-25' of git://github.com/danpoltawski/moodle

commit 6fadab94f0b5790b236aa96012c47e1804ef5858
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 16 May 2013 15:53:48 +0800
Tag:    v2.6.0-beta

Merge branch 'w18_MDL-39678_m26_yui' of git://github.com/skodak/moodle