Git merges in Moodle 2.6.x by Dan Poltawski

commit 864ea90d6d553fb0e166be76d842f910d914449a
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Mar 2014 14:18:22 +0800
Tag:    v2.6.2

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

commit 7442e32e87d3a6c7ad7c6bbc3650307d99529806
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Mar 2014 14:13:35 +0800
Tag:    v2.6.2

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

commit a77f82dacf2cd43a1612ec61c3345ec7c26afcb8
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Mar 2014 12:39:56 +0800
Tag:    v2.6.2

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

commit ed9e1428d13a96d74716012a5435af18606b0d13
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Mar 2014 11:22:37 +0800
Tag:    v2.6.2

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

commit 730440dcf46a52f7095363db7b50d146e5b6b40d
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Mar 2014 10:52:50 +0800
Tag:    v2.6.2

Merge branch 'MDL-44065-m26' of https://github.com/sammarshallou/moodle into MOODLE_26_STABLE

commit 602a3bd3decaefb533ff83226775de7cb0ce9c59
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Mar 2014 17:50:07 +0800
Tag:    v2.6.2

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

commit 5b2f2af6cd62db5c33458a936ce3c14a722aa205
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Mar 2014 16:00:01 +0800
Tag:    v2.6.2

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

commit 6a37f9898e4d23930cb6a3ba095ce9570d3e637c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Mar 2014 15:43:26 +0800
Tag:    v2.6.2

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

commit 5d4abb97b21212db0738d16b514aa784abca4271
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Mar 2014 14:41:32 +0800
Tag:    v2.6.2

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

commit 013de6d5d47ec0416e4f73ec7a23af6615bd22ca
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Mar 2014 12:56:13 +0800
Tag:    v2.6.2

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

commit 51214dd2d18e1238d0eee299ccf7a8d418cdb228
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Mar 2014 15:15:20 +0800
Tag:    v2.6.2

Merge branch 'MDL-44377_26' of https://github.com/stronk7/moodle into MOODLE_26_STABLE

commit d5c7462a6a4cdc03f0b8b47b5e5edec2ac79e34c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Mar 2014 13:34:35 +0800
Tag:    v2.6.2

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

commit 6b25f55ec9cf04776dd26ccf3644f59203305630
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Mar 2014 10:07:15 +0800
Tag:    v2.6.2

Merge branch 'w06_MDL-43344_m26_flow' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 233f8b265a5c947d110dc0580d27e162d84c6b9c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 25 Feb 2014 15:34:00 +0800
Tag:    v2.6.2

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

commit e274eece15efe0144e8fb944b3afaccd6dbccbd5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 25 Feb 2014 10:30:36 +0800
Tag:    v2.6.2

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

commit a43aa9fbf13606eb0a16c0dcb50ecc0a0c4a3fdc
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 19 Feb 2014 09:16:49 +0800
Tag:    v2.6.2

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

commit 29b3c5dfc6fdbf1e920bbc309d1769cad67817b1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Feb 2014 14:14:00 +0800
Tag:    v2.6.2

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

commit 06a8eb06f32953d97e45b5a573aff40aacb6f203
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Feb 2014 12:06:46 +0800
Tag:    v2.6.2

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

commit f23808515bd43c7ee3406d07e7744a2027cbc2be
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Feb 2014 10:32:38 +0800
Tag:    v2.6.2

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

commit 8f89ca5780df1a3cbf7a7c58a969d75bf4b80e85
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 23:29:25 +0800
Tag:    v2.6.2

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

commit 32418eeee0e4dba2865b1d5d269a858560bf6ec3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 15:21:20 +0800
Tag:    v2.6.2

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

commit 0469922b5fd6519973ff4f9a9cf1c64da8a36adb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 14:49:27 +0800
Tag:    v2.6.2

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

commit 1cbda6fabdaa6aec198dcb501da07b3775585ac0
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 14:28:52 +0800
Tag:    v2.6.2

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

commit 1f77f14fb93d3e8f78f4485e11a9bafb9339626c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 12:24:41 +0800
Tag:    v2.6.2

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

commit 574111a94e3ae3830a648483513e0868cdeec20e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 12:19:36 +0800
Tag:    v2.6.2

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

commit 66b74e5aa533cd2dfb23dbd06e1a73602a7138aa
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 11:21:54 +0800
Tag:    v2.6.2

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

commit 5f074a6bb0eaf9947ea052d4c7d0ce4e6dedaef4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 15:29:21 +0800
Tag:    v2.6.2

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

commit 4f02d0074ac60155e2b2525cac2dfc991ee08d09
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 15:25:49 +0800
Tag:    v2.6.2

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

commit 1605660ad21cc16fdf27945da1179a46d8fb7d59
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 14:24:44 +0800
Tag:    v2.6.2

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

commit 8a073e4364e888637dddff9b7dc2bda51b978559
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 12:56:20 +0800
Tag:    v2.6.2

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

commit 37b0d3adad1f23ed391ec68f0e9c40e62f3344ee
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 10:53:53 +0800
Tag:    v2.6.2

Merge branch 'MDL-43671_message_26' of https://github.com/andyjdavis/moodle into MOODLE_26_STABLE

commit da2e9d519b4c2ee81c785e2a001bcdfb09b73779
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 10:33:38 +0800
Tag:    v2.6.2

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

commit e53eb2a2086be762aa466d2f01d1dfdebbe88c9c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 09:45:44 +0800
Tag:    v2.6.2

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

commit 0b8749c89217bf0c2823fc205ad498f9d6bbcd14
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 09:26:12 +0800
Tag:    v2.6.2

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

commit 05297cc0a86e28c19a5e0b53a8f4f845083f4453
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 15 Jan 2014 08:20:39 +0800
Tag:    v2.6.2

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

commit f9d14c4cd7f977f12f087e9504d49479d25f76c7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 16:50:09 +0800
Tag:    v2.6.2

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

commit 79c8b9fcae6e3754e455d921578329298d4b7659
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 15:58:12 +0800
Tag:    v2.6.2

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

commit 33d83d755ac726fdb08397e604a3c642ed1f7dcb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 15:48:52 +0800
Tag:    v2.6.2

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

commit 4a2ac9676af8989fbb8271dc892c39886a74dccd
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 15:37:04 +0800
Tag:    v2.6.2

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

commit 30354dc0d2a6256b412e4f2dfd8a22286dce1b7b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 15:26:52 +0800
Tag:    v2.6.2

Merge branch 'MDL-43178_forum_26' of https://github.com/andyjdavis/moodle into MOODLE_26_STABLE

commit 1e65c37e973e7ef354185057383a8115c28e1ba1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 11:28:44 +0800
Tag:    v2.6.2

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

commit b3eacbd5dafe0d233dafce3157ece07ab75b8a6f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 10:46:34 +0800
Tag:    v2.6.2

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

commit a377868a50757dbbf94c8a95052fac9d735cdc31
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 15:50:34 +0800
Tag:    v2.6.2

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

commit 4d2984c136b892745c9fc3b50ca8155fd548c1e6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 12:37:26 +0800
Tag:    v2.6.2

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

commit 6719aa5ec57b6195127d896820a579baaf53021e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 12:34:58 +0800
Tag:    v2.6.2

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

commit d9dcb97bbe6142ba477fbf72b2ad4960d6d2ea79
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 11:11:12 +0800
Tag:    v2.6.2

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

commit 51bced46a7c64ef5e470deb2217c9a4c8f1f36d8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 11:03:37 +0800
Tag:    v2.6.2

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

commit a893680091eaa581263170cb6bfc0250a507e1f2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 10:07:54 +0800
Tag:    v2.6.2

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

commit 67a75acaffc80e767d3fd9ef1a479cda0e055891
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 10:03:47 +0800
Tag:    v2.6.2

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

commit 892173b3f35e3fddb313953c154dd6dcdeaa94b9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 09:36:12 +0800
Tag:    v2.6.2

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

commit bc7a77f14d6f43b8c5fcf1546602acac34755b53
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 08:54:23 +0800
Tag:    v2.6.2

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

commit 135634fbd38c905c14fe7819ec749e0a4f5ff2b2
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 08 Jan 2014 14:33:11 +0800
Tag:    v2.6.1

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

commit d99f765ee6baf125ed8fb7ac541e18e7591fc1c2
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 08 Jan 2014 11:34:48 +0800
Tag:    v2.6.1

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

commit e86b3c7335f0f8d8a508017a1fce9afdf4cd3074
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 08 Jan 2014 08:21:09 +0800
Tag:    v2.6.1

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

commit d829440fedcbebe65de557fbba96f7fb697d2fc0
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Jan 2014 17:26:01 +0800
Tag:    v2.6.1

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

commit e57bc1637c48816520437a32f03d9e6f765903d2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Jan 2014 17:20:49 +0800
Tag:    v2.6.1

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

commit 9fe6a6f42be7c05c9511f10d10bad7bcf9812dce
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Jan 2014 12:43:29 +0800
Tag:    v2.6.1

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

commit 836399115b310467f512045e97ac77ef05b99814
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Jan 2014 11:51:18 +0800
Tag:    v2.6.1

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

commit adb28ab708b3113208125e5f9ccdb1c559e93634
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Jan 2014 11:08:28 +0800
Tag:    v2.6.1

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

commit 883ea035afffe367e4b4cc7b7a649d990611bd3b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Jan 2014 11:00:12 +0800
Tag:    v2.6.1

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

commit e3e938b861183035901d5e1b55eca4eace060c3d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Jan 2014 14:21:45 +0800
Tag:    v2.6.1

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

commit 8d7c3b0d503ffaa632f75b4a3914068d7aca6ac9
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 18 Dec 2013 14:59:59 +0800
Tag:    v2.6.1

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

commit d04814641b5877a23e044da2ce2988c394dd0bb2
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 05 Dec 2013 15:10:13 +0800
Tag:    v2.6.1

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

commit b01548ecba574d1425d2510b03e1d7cd692b2c17
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 04 Dec 2013 15:44:08 +0800
Tag:    v2.6.1

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

commit 307d9612776e2b610cb32d22632633025ad44d22
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 04 Dec 2013 15:06:30 +0800
Tag:    v2.6.1

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

commit 0e44ba37cf1f7830cdec6a180a11071e8259c7e1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Dec 2013 16:08:22 +0800
Tag:    v2.6.1

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

commit 77325154af2b7d122a47fc6668105a8e8b376248
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Dec 2013 13:46:26 +0800
Tag:    v2.6.1

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

commit 61ae30255c737930111db70c09a9fe70486e6c6f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Dec 2013 12:36:52 +0800
Tag:    v2.6.1

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

commit d8be1d9ac5288c980c1243d3c2b714e202a9b72b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Dec 2013 14:53:37 +0800
Tag:    v2.6.1

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

commit d76bc30606dd3bef1ce22ab12c1321b1a0a9fccf
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Dec 2013 11:58:23 +0800
Tag:    v2.6.1

Merge branch 'w49_MDL-43106_m26_doublecookie' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 0c94afe7afa8192f4b3c2903750155afddc77b6c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Dec 2013 11:19:45 +0800
Tag:    v2.6.1

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

commit 6ba3f5d72a342cf6712fea01965371257dfda58e
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 29 Nov 2013 12:52:52 +0800
Tag:    v2.6.1

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

commit 9e56dabab6e118258a9ef0faa151263de7f52c3e
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 27 Nov 2013 11:37:25 +0800
Tag:    v2.6.1

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

commit 44e5ac93bcf758e5d258e3d5a653d0a2a20288de
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 26 Nov 2013 14:57:15 +0800
Tag:    v2.6.1

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

commit 46d1d519f831f28f5046f180deb3ee4381093849
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 26 Nov 2013 14:48:38 +0800
Tag:    v2.6.1

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

commit ace15cee6da08d6011eabd4daca2e7045e88c5d9
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 26 Nov 2013 13:24:41 +0800
Tag:    v2.6.1

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

commit e55207d9d7a3287d34e00d5f7e7e46be24c7e450
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 26 Nov 2013 12:09:47 +0800
Tag:    v2.6.1

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

commit 5ffad8a4063e23b6573d2371c766ed6520070776
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 26 Nov 2013 10:42:08 +0800
Tag:    v2.6.1

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

commit 00b965f60942fcab69c03106946620d1a8321e5c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 26 Nov 2013 10:25:01 +0800
Tag:    v2.6.1

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

commit 749db57b4c396a71afe84312af29a59d7c37e9d6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Nov 2013 13:40:56 +0800
Tag:    v2.6.1

Merge branch 'w48_MDL-37016_m26_sloppymysql' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 0f4ea5911c48275c9c1f59a6ff6924ed7ca3be10
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Nov 2013 12:22:56 +0800
Tag:    v2.6.1

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

commit 6508a3c68ecefa9cadbfd151d9aea34d450f0a22
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Nov 2013 11:06:41 +0800
Tag:    v2.6.1

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

commit 9e2bc0490f8e48ae532d3210580fa3093309c0e1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Nov 2013 10:49:02 +0800
Tag:    v2.6.1

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

commit a2aceccdbed274a6efa448947c4c2503ff16b9f0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Nov 2013 10:43:31 +0800
Tag:    v2.6.1

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

commit d3ec6a9dcf9915fecdccac41694cc78f85ecd052
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Nov 2013 10:37:36 +0800
Tag:    v2.6.1

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

commit 5af5a205a366aa26f260b2a7fbbf492433958c7b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Nov 2013 10:39:33 +0800
Tag:    v2.6.1

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

commit 904f5815c709422a1f94d889cedc3a808b434944
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Nov 2013 14:30:50 +0800
Tag:    v2.6.1

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

commit 46af0399258ff51c6a78026bcffd30b24d540f43
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 08 Nov 2013 16:08:20 +0800
Tag:    v2.6.0-rc1

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

commit dbb68d77794969a7ea7cc42ee55b3afb9ff6d98a
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 08 Nov 2013 16:05:06 +0800
Tag:    v2.6.0-rc1

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

commit d06d812c51fb0cb14c24945cdcea8351ab25ffbc
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 08 Nov 2013 15:32:11 +0800
Tag:    v2.6.0-rc1

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

commit 379cbb459aa84c3970cba2098dd1ce78c3599ff7
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 08 Nov 2013 11:11:28 +0800
Tag:    v2.6.0-rc1

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

commit 0967c74a3d82d5921f766a333a2504aff1c778ee
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 07 Nov 2013 17:21:54 +0800
Tag:    v2.6.0-rc1

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

commit 48fe93fa26e76d7b7f0791fe2b38ae503b78819f
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 07 Nov 2013 17:17:32 +0800
Tag:    v2.6.0-rc1

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

commit b74c8389b1fe7cd6f3ded2d8f7dfa84c2fa92800
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 07 Nov 2013 14:19:14 +0800
Tag:    v2.6.0-rc1

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

commit d4308dff593885c009a577c7671bc15defe2581f
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 07 Nov 2013 11:58:46 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42628_b' of https://github.com/rwijaya/moodle

commit f6a2a36bcd97d2750f8b6aba65e9be70b04c3c84
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 07 Nov 2013 11:44:01 +0800
Tag:    v2.6.0-rc1

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

commit 57d14266a8287d30730116e0407144aeaa6ca087
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 07 Nov 2013 11:23:11 +0800
Tag:    v2.6.0-rc1

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

commit 0b353ee03e55eb943722e51cdd2b40ba5384e2dd
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 07 Nov 2013 11:19:15 +0800
Tag:    v2.6.0-rc1

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

commit 02c6bd358f98404e0ff4f4a99fe0dd5b06f537ad
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 07 Nov 2013 09:34:31 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42728-en_fix' of git://github.com/mudrd8mz/moodle

commit dc08bfe55845ea9df917614f23986229dbf271ef
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 06 Nov 2013 15:04:20 +0800
Tag:    v2.6.0-rc1

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

commit 61bac37cf136f557571aa7ea0f27c8346d6e28c6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Nov 2013 17:25:53 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42332-fix-modal-window' of git://github.com/dmonllao/moodle

commit bd706fb5901bd0943d7a2f4ce530d6c61da68440
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Nov 2013 16:39:27 +0800
Tag:    v2.6.0-rc1

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

commit 8d81bd5d1e32b3b90f6f9f5d6c4cb0f0710297e3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Nov 2013 15:52:48 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42363-fix-redirect-issue' of git://github.com/dmonllao/moodle

commit e957dfa549679ecc69b205a5ce4f6522a8509539
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Nov 2013 15:06:36 +0800
Tag:    v2.6.0-rc1

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

commit 6ce30a3e2c26bdd9bab25a00388f1c1a10225f53
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Nov 2013 12:34:35 +0800
Tag:    v2.6.0-rc1

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

commit 0fe02089a42ae771f43dca36d3b4a7ebc8737afe
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Nov 2013 11:24:02 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42476' of https://github.com/srynot4sale/moodle

commit 24a922e95301027ac02485fafbf13037f7a3aa22
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 23:40:33 +0800
Tag:    v2.6.0-rc1

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

commit dcc08e55b5df5855de2291c4e1e98b8ce3966c64
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 23:34:18 +0800
Tag:    v2.6.0-rc1

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

commit a28c6b440e5fa5604406fd6deb15c7a366138627
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 22:54:09 +0800
Tag:    v2.6.0-rc1

Merge branch 'wip-MDL-42270_master_2' of git://github.com/gjb2048/moodle

commit 5e70fc1f9c6234b6a1edbd779e02147042c4a10a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 22:34:27 +0800
Tag:    v2.6.0-rc1

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

commit efe938fca59a2c1a5d7e3af1cede182aa95d95e5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 22:31:55 +0800
Tag:    v2.6.0-rc1

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

commit 4a17894ac543bc93748ad67b7716d99b5747884c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 22:27:49 +0800
Tag:    v2.6.0-rc1

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

commit 2c7b23a23988fbc2a35332e16c826511201cbd8e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 22:17:19 +0800
Tag:    v2.6.0-rc1

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

commit 07ba528bd426ccb5afbc978ef2eec202a176ba96
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 21:51:57 +0800
Tag:    v2.6.0-rc1

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

commit 6db9f41419dcef8b5be301383149deea1660e7a8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 20:10:24 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42355_editpdf_deselect_comment' of git://github.com/davosmith/moodle

commit 22379484fd40e1164cf563d184f0506324513ec1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 19:35:01 +0800
Tag:    v2.6.0-rc1

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

commit 81da82f5f3199541ad1e0ab910bae1a0ce1cb516
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 17:21:29 +0800
Tag:    v2.6.0-rc1

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

commit 28cc8d4b43fb2eece42fd8207effa52b1997cc34
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 16:39:39 +0800
Tag:    v2.6.0-rc1

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

commit 71fbce44106f41549d5d027857a42c963f588cbd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 16:21:25 +0800
Tag:    v2.6.0-rc1

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

commit db6767ae475d28bb76ba589fa1a62785e86231a3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 16:14:04 +0800
Tag:    v2.6.0-rc1

Merge branch 'w45_MDL-42044_m26_zipaddon' of https://github.com/skodak/moodle

commit 466fa368b58665d2e615beb42609f417ca5fd6f2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 15:32:34 +0800
Tag:    v2.6.0-rc1

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

commit b763a03ddbde5bda52a7021385b76a2b2ed839cf
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 14:51:16 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42494-workshop-exception' of git://github.com/mudrd8mz/moodle

commit fa5b21216f4cb8db74e698a2938a21cdd4e47aeb
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 14:13:27 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42286_behat' of https://github.com/andyjdavis/moodle

commit 9261a3b0d109b79901d2b9925131fac70c32c34f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 12:30:12 +0800
Tag:    v2.6.0-rc1

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

commit 92dc72a6b56d0e424398a1799fc11c6bd96fcd71
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 12:10:39 +0800
Tag:    v2.6.0-rc1

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

commit 54173d418037242437c2897b2a5f150ee4fd1b30
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 01 Nov 2013 17:31:17 +0800
Tag:    v2.6.0-rc1

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

commit 4c3b5e6e1ff3c43b6ed654d59e69fc2689b0778a
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 01 Nov 2013 15:47:31 +0800
Tag:    v2.6.0-rc1

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

commit e3944841797736dc19a06dd8d4ed927bd76f29b9
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 31 Oct 2013 18:38:25 +0800
Tag:    v2.6.0-rc1

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

commit 3dc774b8efc5547a3005718afa1d6150d033276e
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 31 Oct 2013 12:20:38 +0800
Tag:    v2.6.0-rc1

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

commit d61d4c1bf692f42e538cb53cb7d2cace7cbc4101
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 31 Oct 2013 12:14:50 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42482_editpdf_blank_comments' of git://github.com/davosmith/moodle

commit fcdc58897600b10b93a89917b7ba9b95c75ab7b5
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 31 Oct 2013 11:54:07 +0800
Tag:    v2.6.0-rc1

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

commit 9b0cc9ddf2bfc99245ea264b80f42cc9361994b9
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 31 Oct 2013 11:48:00 +0800
Tag:    v2.6.0-rc1

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

commit fc74cc8238d679d50843042bdebd64164ef787b6
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 31 Oct 2013 11:27:49 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42352_editpdf_scrolling' of git://github.com/davosmith/moodle

commit e9b7148ba7c7256775044c5d674211b350898cd9
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 31 Oct 2013 10:56:45 +0800
Tag:    v2.6.0-rc1

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

commit 51bd152e34b21f4c295aba25e799367548dc1784
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 31 Oct 2013 10:08:23 +0800
Tag:    v2.6.0-rc1

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

commit d7052f748bdac5a43bf730f49984172a3a8886ed
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 30 Oct 2013 17:24:06 +0800
Tag:    v2.6.0-rc1

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

commit d147e833c0000c7f357aadb211440373684104ee
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Oct 2013 17:28:25 +0800
Tag:    v2.6.0-rc1

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

commit 576abe8f3979ef090ff8687d4773be512b87967a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Oct 2013 15:08:13 +0800
Tag:    v2.6.0-rc1

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

commit c966d2e8c8114d45c961c0d9400a2327133b3a1d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Oct 2013 15:03:52 +0800
Tag:    v2.6.0-rc1

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

commit 6cd49ef747be0a3be03483f2a1b4cd4ef6ea51a5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Oct 2013 14:54:44 +0800
Tag:    v2.6.0-rc1

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

commit 76aa53f2d8e2b05cdcf92fd44cacef5568492514
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Oct 2013 14:48:27 +0800
Tag:    v2.6.0-rc1

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

commit c426631850583777f1f93e4e159ff7f4ad798d65
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Oct 2013 14:43:02 +0800
Tag:    v2.6.0-rc1

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

commit d3428bc93af7005ec5930bac6ffeccf7a430ff30
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Oct 2013 13:42:56 +0800
Tag:    v2.6.0-rc1

Merge branch 'w44_MDL-42485_m26_memcachedlocktimeout' of https://github.com/skodak/moodle

commit 7d3cdcc90dfbfd5aaead289c24b741b5bfb4a9b9
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Oct 2013 13:16:44 +0800
Tag:    v2.6.0-rc1

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

commit b6df9f8f557d49d68be04669c2b93207aec3ba03
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Oct 2013 13:09:23 +0800
Tag:    v2.6.0-rc1

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

commit e29dcc5a5b69ab2670c83e2ab8af72dfdca2f4bf
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Oct 2013 12:10:44 +0800
Tag:    v2.6.0-rc1

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

commit b0d92c0cec3dd85704db368cd9e2d0a3857c6937
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Oct 2013 11:31:32 +0800
Tag:    v2.6.0-rc1

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

commit 0e9b07697366774bbb8cf28b9a1b8a679ce386f0
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Oct 2013 11:08:45 +0800
Tag:    v2.6.0-rc1

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

commit 4daa024fd419e78fea87cb702ea308d0b27622eb
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Oct 2013 16:31:17 +0800
Tag:    v2.6.0-rc1

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

commit b1a6c9dc5253d1666659c86260747b965bf9998b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Oct 2013 15:37:05 +0800
Tag:    v2.6.0-rc1

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

commit 10ac20830b620d9856f47555e2aa10d85f9bc5d6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Oct 2013 14:53:21 +0800
Tag:    v2.6.0-rc1

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

commit ff1ec8b50fb040891ae90c0fc0e5192076a47956
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Oct 2013 14:15:27 +0800
Tag:    v2.6.0-rc1

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

commit f76bd72234484462f85488205199c77a809862af
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Oct 2013 12:33:39 +0800
Tag:    v2.6.0-rc1

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

commit bdbca0949f1b4223b8ec3291fe61317d391c9332
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Oct 2013 11:35:54 +0800
Tag:    v2.6.0-rc1

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

commit 96d0198b8acec63cfe85d6cd61a164f6db2888e8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Oct 2013 11:21:26 +0800
Tag:    v2.6.0-rc1

Merge branch 'wip-mdl-42491-master' of git://github.com/deraadt/moodle

commit 4baf482daa4b6d652a3c6d18c8561f1852634c39
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Oct 2013 11:10:43 +0800
Tag:    v2.6.0-rc1

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

commit 92fbc0de262a9a6bacb67739a0c9657c7927e8a8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Oct 2013 10:51:44 +0800
Tag:    v2.6.0-rc1

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

commit c713639b65296b9f570194c2123c39b3e71608e1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Oct 2013 10:43:07 +0800
Tag:    v2.6.0-rc1

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

commit 534c356a876770ffd0a1c7b1a25fe8d96a9ae3b3
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 Oct 2013 15:55:27 +0800
Tag:    v2.6.0-rc1

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

commit 3e2b1a15aa34a822cd0cab4d67b98451ca4f280f
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 Oct 2013 15:27:48 +0800
Tag:    v2.6.0-rc1

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

commit d62cddc5695204894ee1ad633b4714316bbfac63
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 Oct 2013 13:47:00 +0800
Tag:    v2.6.0-rc1

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

commit b2d08cad469f884aa965fbed8379a0d97b7151c4
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 Oct 2013 12:42:38 +0800
Tag:    v2.6.0-rc1

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

commit cf49c1b6421d20060ebaa8deb45397ff55c65161
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 Oct 2013 12:39:37 +0800
Tag:    v2.6.0-rc1

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

commit 6356be73d03b6fb9686e915ec67dcd8116d4090c
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 Oct 2013 11:33:19 +0800
Tag:    v2.6.0-rc1

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

commit eb04bc4a866d1f6e40ceaabefd358aa81f9be65a
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 Oct 2013 10:05:55 +0800
Tag:    v2.6.0-rc1

Merge branch 'w43_MDL-42381_m26_ole' of https://github.com/skodak/moodle

commit e36f72414dbb49256dab4e8515fe69943ffa949e
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Oct 2013 16:57:47 +0800
Tag:    v2.6.0-rc1

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

commit 3f9a9e86b334523d4c4182a8bb98471e4e55d128
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Oct 2013 16:28:46 +0800
Tag:    v2.6.0-rc1

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

commit 5ab04db3564f0d5ffe13cea615a2d011ecc0c7be
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Oct 2013 16:15:24 +0800
Tag:    v2.6.0-rc1

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

commit 76dcc0ee21bae61565a1ac619fcb887e3eb24e78
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Oct 2013 16:07:17 +0800
Tag:    v2.6.0-rc1

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

commit 680d9052ad7a2c90e6ba03c8efc2ec51f7b51e78
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Oct 2013 15:55:52 +0800
Tag:    v2.6.0-rc1

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

commit 012b0472c5f5e21dbaaa5baf6cfb7ff5c60596bd
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Oct 2013 15:47:48 +0800
Tag:    v2.6.0-rc1

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

commit c6dd6d2eb793c9df1cd1bdd9407ef7a35962d3e6
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Oct 2013 15:15:07 +0800
Tag:    v2.6.0-rc1

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

commit 2d2c5f36c4c8ae28ede29803f2bff2f0fe6bb775
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Oct 2013 12:43:52 +0800
Tag:    v2.6.0-rc1

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

commit 205d507f87a4aa063f30d4c16272833c8bb0fa6f
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Oct 2013 12:39:38 +0800
Tag:    v2.6.0-rc1

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

commit f76c87151fa372ffc4543ef61e10a29b7c48fe93
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Oct 2013 12:33:15 +0800
Tag:    v2.6.0-rc1

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

commit 93488d8bb01473085244ef4c29fe70a2096583ab
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Oct 2013 10:27:23 +0800
Tag:    v2.6.0-rc1

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

commit 459dbd43622d58cf5b96bf4a7c310d514fc3c6ae
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Oct 2013 10:19:47 +0800
Tag:    v2.6.0-rc1

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

commit b8a5092f2ed8355b7b2609181bec7644de2bd026
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Oct 2013 15:26:54 +0800
Tag:    v2.6.0-rc1

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

commit 276c451b2a915b619bbd9405a28cc54be2e85110
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Oct 2013 15:12:22 +0800
Tag:    v2.6.0-rc1

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

commit 0f136c1a5b04c3be3d0adab1eda478cbd756cc39
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Oct 2013 14:36:07 +0800
Tag:    v2.6.0-rc1

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

commit 40f0a3abed43715a4d89f7f3241857742edfc885
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Oct 2013 13:20:08 +0800
Tag:    v2.6.0-rc1

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

commit 8c8a844f2bb5dfcde1e84ab7526a60d1e1455256
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Oct 2013 13:18:45 +0800
Tag:    v2.6.0-rc1

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

commit d0041fb110201d3dc1a4546eca8b6108b440d1c5
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Oct 2013 13:15:48 +0800
Tag:    v2.6.0-rc1

Merge branch 'w43_MDL-38743_m26_private' of https://github.com/skodak/moodle

commit de3d8fda10d57c34297cd4b2641293e5c63a2456
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Oct 2013 12:37:45 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-40531' of https://github.com/stronk7/moodle

commit 174df12acb297d68fa09e943394cee458931dca2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Oct 2013 20:51:30 +0800
Tag:    v2.6.0-rc1

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

commit 8c3ebb1a9fd37c3387585c264ebcf57c87313166
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Oct 2013 17:54:10 +0800
Tag:    v2.6.0-rc1

Merge branch 'w43_MDL-42440_m26_authenable' of https://github.com/skodak/moodle

commit 2d79065013bb6e7d13410511a1737b86fa17faf6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Oct 2013 16:29:59 +0800
Tag:    v2.6.0-rc1

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

commit 6f4747d7b42136a56927071d0d57562912c4f305
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Oct 2013 15:16:08 +0800
Tag:    v2.6.0-rc1

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

commit d4256630e75c3039637386d6de83a01287c7ebb1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Oct 2013 15:02:05 +0800
Tag:    v2.6.0-rc1

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

commit a8261e2830067c74dd5279145dba15c485572285
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Oct 2013 13:19:27 +0800
Tag:    v2.6.0-rc1

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

commit 0c7c5e767c852a5633cde8b22a13ccebe795e8c5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Oct 2013 13:09:31 +0800
Tag:    v2.6.0-rc1

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

commit 616e57d92690725b29772646df8fda45513e76aa
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Oct 2013 13:00:23 +0800
Tag:    v2.6.0-rc1

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

commit 59dca9505b7108196f20bf3828c1a65924bc0192
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Oct 2013 11:52:26 +0800
Tag:    v2.6.0-rc1

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

commit 181b0b3c3e4c2c17bd91fb12553b9247f32f461f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Oct 2013 11:51:03 +0800
Tag:    v2.6.0-rc1

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

commit b750557ba0f82cf9a80c23d75f105960ac71e22e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Oct 2013 10:25:44 +0800
Tag:    v2.6.0-rc1

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

commit 9c5ab08e5a73d8425adfdb441063d80b164871b9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Oct 2013 13:58:14 +0800
Tag:    v2.6.0-rc1

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

commit 2d0316d60de95a59e700345b84515b5204b1f968
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Oct 2013 11:24:51 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-26244_url' of https://github.com/andyjdavis/moodle

commit f381eede5157da1b7f6c72bb6e642557890f729a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Oct 2013 11:15:21 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42408_master' of https://github.com/dmonllao/moodle

commit fb032ccb3f4652dc87a7c33fe66a556f31660d83
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Oct 2013 10:57:44 +0800
Tag:    v2.6.0-rc1

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

commit 8173f4cf017dd6c7074ebfe4168d890c6e9e80ef
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Oct 2013 08:56:46 +0800
Tag:    v2.6.0-rc1

Merge branch 'w43_MDL-42438_m26_yuicss' of https://github.com/skodak/moodle

commit 898247045206e1d215186dcd601f8992850f2d45
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Oct 2013 16:16:11 +0800
Tag:    v2.6.0-beta

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

commit c68bf34f83b024570127306ba049d47c9c215dd9
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 17 Oct 2013 16:29:05 +0800
Tag:    v2.6.0-beta

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

commit bca2951282db9e7cb38e98cf2b978ed6283c2e6e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Oct 2013 14:43:02 +0800
Tag:    v2.6.0-beta

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

commit e3aa1fa929986f89a41b8a8bdaad7ad129a2f375
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Oct 2013 11:53:26 +0800
Tag:    v2.6.0-beta

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

commit bd81762784a3b5147b64a0cb9e5a8c56bd8c101f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Oct 2013 09:32:27 +0800
Tag:    v2.6.0-beta

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

commit c79239b2947ed6a8a32ed684cea31e3793ac64c7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Oct 2013 16:11:50 +0800
Tag:    v2.6.0-beta

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

commit 7159340f7fdcc776eb750dce21a3ead72a446400
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Oct 2013 15:46:22 +0800
Tag:    v2.6.0-beta

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

commit 7a1ce7769c1e57819c8f3520b33ae61cf5fb397f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Oct 2013 14:36:14 +0800
Tag:    v2.6.0-beta

Merge branch 'w42_MDL-42082_m26_authdbpass' of https://github.com/skodak/moodle

commit 7bed57ae1f35d5d9a692722d1755b92a007b1122
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Oct 2013 14:24:02 +0800
Tag:    v2.6.0-beta

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

commit b011a17b2607b91ec85995b6d15f2ee574d9ecc5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Oct 2013 12:11:23 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41672-text-mail-links' of git://github.com/mudrd8mz/moodle

commit b1bdb61e90eac838640af0a8d7a3cb21fd40d7ad
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Oct 2013 12:07:54 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-42167-workshop-update-record' of git://github.com/mudrd8mz/moodle

commit 00ae230f526ee65218f373c27669d32b3adeeaa6
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 10 Oct 2013 10:31:44 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41379_outcomes' of https://github.com/andyjdavis/moodle

commit e077f21827c2c333ddd6bfd533dcccd4634965f8
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 10 Oct 2013 08:18:28 +0800
Tag:    v2.6.0-beta

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

commit c08f914799217c8735aa40f4fc0990c2dbd2a682
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 10 Oct 2013 07:20:18 +0800
Tag:    v2.6.0-beta

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

commit 54cd84c84bdab444c3057421f854162593da23bd
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Oct 2013 18:16:56 +0800
Tag:    v2.6.0-beta

Merge branch 'w41_MDL-42054_m26_phpmailertesting_i' of https://github.com/skodak/moodle

commit f57053fc2a31cdc945601766214231dfa4223263
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Oct 2013 17:23:44 +0800
Tag:    v2.6.0-beta

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

commit c1636aea88582f0b06667245bae05d22be97a067
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Oct 2013 17:01:10 +0800
Tag:    v2.6.0-beta

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

commit 117111b78b6c4b5969ac15e3f5fb8dd7ce98d4ee
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Oct 2013 16:54:02 +0800
Tag:    v2.6.0-beta

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

commit 07b0214588ddd0753aeea7c7bda365335196d42f
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Oct 2013 16:46:56 +0800
Tag:    v2.6.0-beta

Merge branch 'm26_MDL-40226_Add_JNLP_MIME_Type_Support' of https://github.com/scara/moodle

commit bbe834a152bd00b2a0657e276e20f2ee85b5371c
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Oct 2013 16:28:53 +0800
Tag:    v2.6.0-beta

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

commit c58b3ca0ca56a42f7974af4bcd505b3e4d2eae8f
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Oct 2013 16:27:50 +0800
Tag:    v2.6.0-beta

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

commit e521e0724e3f8ed55aaf0ba50d832e5590c2ad49
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Oct 2013 11:16:34 +0800
Tag:    v2.6.0-beta

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

commit e9091a28f5e5f9066f5b6c552b48cd87059ac423
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Oct 2013 10:54:24 +0800
Tag:    v2.6.0-beta

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

commit 9d841c6c90985c2e00f025d06b14716a1c372bed
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Oct 2013 10:27:07 +0800
Tag:    v2.6.0-beta

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

commit 4f0eaf18f42a9ff8e11118b7f04195479ba10169
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Oct 2013 16:42:17 +0800
Tag:    v2.6.0-beta

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

commit b56a6981b330a83fa321b6ee1564ea67fbfa3017
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Oct 2013 15:19:09 +0800
Tag:    v2.6.0-beta

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

commit bcb3c375e3daa99fcfe361d8b1fda828dfe81d46
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Oct 2013 14:33:27 +0800
Tag:    v2.6.0-beta

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

commit fa96fb0cea39de729267be4e63dc1d28d8cc1a9f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Oct 2013 13:33:25 +0800
Tag:    v2.6.0-beta

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

commit 8431c290fd9946df506a1dac63f57062ba2acd88
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Oct 2013 13:25:12 +0800
Tag:    v2.6.0-beta

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

commit 6cd7df4df1749a9d937b047e76fba1042574d2ee
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Oct 2013 13:21:30 +0800
Tag:    v2.6.0-beta

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

commit d1050e406f0262eed1f00536ae568ce89adc6182
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Oct 2013 11:26:37 +0800
Tag:    v2.6.0-beta

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

commit 261dc01734364af69ce551ee8ac2f8aa56787e1b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 17:35:40 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40733_forum_name' of https://github.com/andyjdavis/moodle

commit 50d7cc8463c43946ae683e3e51d6aa50ecc5146f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 17:30:04 +0800
Tag:    v2.6.0-beta

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

commit 89cb942c6d19595274e4fd5594baff4dd8803e59
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 17:14:40 +0800
Tag:    v2.6.0-beta

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

commit 62b35d5852b4e70ca7b2f9c49d2ae47bb25e3144
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 16:00:52 +0800
Tag:    v2.6.0-beta

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

commit c219df86d1fd9b9721dff320f2534bbadf4dd607
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 15:29:23 +0800
Tag:    v2.6.0-beta

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

commit 4bdabf596826f98082e2b4b67d8942324a58f385
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 15:21:49 +0800
Tag:    v2.6.0-beta

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

commit f2ee9b5c27931688c8f6360d5b81f203af240dad
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 14:58:54 +0800
Tag:    v2.6.0-beta

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

commit 92d92606baa9911df412e750fb604dc6254269eb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 14:33:41 +0800
Tag:    v2.6.0-beta

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

commit 03608c253da0b53c37a342230c934be4fe940430
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 14:25:48 +0800
Tag:    v2.6.0-beta

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

commit f07c2243b1f183a3b9010b350385efd2f20cd537
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 14:12:14 +0800
Tag:    v2.6.0-beta

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

commit e025a2fc43455ccef662f8e8abd1159e72902a17
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 13:39:01 +0800
Tag:    v2.6.0-beta

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

commit f7e719eb38a2c6179738c9ed58abe6bb05798b1a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 13:23:47 +0800
Tag:    v2.6.0-beta

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

commit 840bbc1b645c6dd640de5d4baedd4d0e46ca1e6f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 12:04:51 +0800
Tag:    v2.6.0-beta

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

commit f841aa780d4254dde7ae3d2ccb4245960f2afa57
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 11:13:29 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-38570-master' of https://github.com/timgus/moodle

commit 30d6c394e2a45b0b633a51c2a78c21d307e80de6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 10:27:59 +0800
Tag:    v2.6.0-beta

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

commit 0df3254212be90e5b2382ccdc2c02bcc825bb2af
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Sep 2013 18:04:05 +0800
Tag:    v2.6.0-beta

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

commit cdf6fc243e666fe3b0893606d84457bc1eea9dbb
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Sep 2013 17:37:49 +0800
Tag:    v2.6.0-beta

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

commit 8eb80a2c425a53877513abe869df09c8be00bfd7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Sep 2013 17:13:22 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-37804' of github.com:recreate/moodle

commit 867af9c4f3a310c0662e456bc318f0a4703bfe6d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Sep 2013 15:29:48 +0800
Tag:    v2.6.0-beta

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

commit 76c88eaffb6047ec34abbf419059a433f1944715
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Sep 2013 14:23:41 +0800
Tag:    v2.6.0-beta

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

commit d95e8420df1675abf7a7cb48ef78a6a405450d8a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Sep 2013 10:22:02 +0800
Tag:    v2.6.0-beta

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

commit ba7b843c018b3119e907d8c38c6ebfb736e86c6f
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 05 Sep 2013 14:42:31 +0800
Tag:    v2.6.0-beta

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

commit 0de0e38bc428c3efe0f42b59dbbcd40b0becb1ca
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 05 Sep 2013 10:34:11 +0800
Tag:    v2.6.0-beta

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

commit bc16c7a0e3bf7ee41a1ce6bddae4ee6843b96c13
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 04 Sep 2013 16:59:20 +0800
Tag:    v2.6.0-beta

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

commit 259dfc252178d2b7ac642d69e4ac6409c4b848b0
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 04 Sep 2013 11:09:30 +0800
Tag:    v2.6.0-beta

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

commit 7e2a4e1638806cbae9ec38025c7315801fbe4590
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 04 Sep 2013 10:38:10 +0800
Tag:    v2.6.0-beta

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

commit 4f9c5f332b61af564de64f3d0deb8ec4c72b0c7a
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 04 Sep 2013 10:33:33 +0800
Tag:    v2.6.0-beta

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

commit 1f34b19a3355558a0e98a3f1d22918f530d8e97e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Sep 2013 16:05:38 +0800
Tag:    v2.6.0-beta

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

commit 5c1ba238d2671232c4fcc1222d957cf90aefe06a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Sep 2013 14:10:02 +0800
Tag:    v2.6.0-beta

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

commit f3549a51a76c6f73fd065185350f400c4dd0acc3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Sep 2013 12:58:27 +0800
Tag:    v2.6.0-beta

Merge branch 'w36_MDL-41255_m26_changepw' of https://github.com/skodak/moodle

commit c247756b0ca5fc8985e26fa0d7d6cb5124a55efd
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Sep 2013 12:27:26 +0800
Tag:    v2.6.0-beta

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

commit 4ffd70f3153821298aa5914845a4273b68c1f717
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Sep 2013 11:48:45 +0800
Tag:    v2.6.0-beta

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

commit c6569641e7c4ea98f13bc6a3b9206f4df1150499
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Sep 2013 10:51:27 +0800
Tag:    v2.6.0-beta

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

commit 29db803ac783acb8cc1890f559bacab7bb120b62
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Sep 2013 10:40:28 +0800
Tag:    v2.6.0-beta

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

commit 2b1e887561602af20384d18e921ab64b14a0df61
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Sep 2013 10:06:38 +0800
Tag:    v2.6.0-beta

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

commit 6affe9e695605af00e578f0082164e2734219c30
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Sep 2013 09:53:22 +0800
Tag:    v2.6.0-beta

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

commit ee0be46957714e4c73f9b4f17c9d9d29d44aadfd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Sep 2013 17:32:08 +0800
Tag:    v2.6.0-beta

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

commit 56b9e0b5653972b8bc3a6ec43e40159594c43d3c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Sep 2013 17:25:27 +0800
Tag:    v2.6.0-beta

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

commit 53d9e41bb9173e8c59699d4ef4db5c8fa848e3c4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Sep 2013 17:22:14 +0800
Tag:    v2.6.0-beta

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

commit f1b10b36ea0db97e8dbf5e5965e77b26ee79f843
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Sep 2013 16:27:46 +0800
Tag:    v2.6.0-beta

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

commit 4abcb5c5e26d3572cb28e53bede2e636d90ce6fa
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Sep 2013 16:21:48 +0800
Tag:    v2.6.0-beta

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

commit 6b25e62f4886c840e93fff64845f48f87a680e09
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Sep 2013 15:23:05 +0800
Tag:    v2.6.0-beta

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

commit 597229244452356dd1aa392518ceccae96ce75dc
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Sep 2013 14:10:28 +0800
Tag:    v2.6.0-beta

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

commit fff084b29f7cff39127f7037733a1a55467f70d9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Sep 2013 11:50:38 +0800
Tag:    v2.6.0-beta

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

commit 70189e7ad2022844f4d8775f10b1a013e5ffd79f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Sep 2013 11:44:51 +0800
Tag:    v2.6.0-beta

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

commit 575c57df0af3710f0e774596a769678e336922a5
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 29 Aug 2013 10:15:47 +0800
Tag:    v2.6.0-beta

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

commit d9cf3ca0b0da1c858f0832b1ebb6764d522a590f
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 28 Aug 2013 10:00:46 +0800
Tag:    v2.6.0-beta

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

commit 939320f72177120a35c380d208294e3531487aad
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Aug 2013 18:09:34 +0800
Tag:    v2.6.0-beta

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

commit d76cb8ee26a5425aa91b89cac7bf8e923dc82140
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Aug 2013 15:47:52 +0800
Tag:    v2.6.0-beta

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

commit 4436225eb14903b0d853b0b4f611d53c7f529447
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Aug 2013 15:06:38 +0800
Tag:    v2.6.0-beta

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

commit eb1526e059d50345710cc9b487cb40f479c0e13e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Aug 2013 14:06:54 +0800
Tag:    v2.6.0-beta

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

commit 9a6c6d1cfd9e5d01cc9eb859fa963385791b260b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Aug 2013 13:51:40 +0800
Tag:    v2.6.0-beta

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

commit 80979f76eeea5422cdbda5d34f3d08c6bbc4dc6b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Aug 2013 13:47:39 +0800
Tag:    v2.6.0-beta

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

commit e820d50791ddced82f0d7e001bba32589cb3df71
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Aug 2013 11:54:28 +0800
Tag:    v2.6.0-beta

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

commit 67c6ab16464d37e10d91d9d5f88684ea9f006a9f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Aug 2013 11:03:35 +0800
Tag:    v2.6.0-beta

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

commit d1584b6165e3c77f0f453817f3a0ac6024a382d8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Aug 2013 10:57:09 +0800
Tag:    v2.6.0-beta

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

commit 02ebac0bf17eccb0dc39a61dbce7ffcf0d974fd6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Aug 2013 10:55:51 +0800
Tag:    v2.6.0-beta

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

commit 51eba172e68b14bfa0fbc7ba39eec62d8092b2c9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Aug 2013 17:50:08 +0800
Tag:    v2.6.0-beta

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

commit a0df83441b62bf246e4f84d7ce5582e0a82588ff
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Aug 2013 17:47:05 +0800
Tag:    v2.6.0-beta

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

commit aa8fe639370e8060f0ab2fde9dbff65d8589718a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Aug 2013 15:09:33 +0800
Tag:    v2.6.0-beta

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

commit 11b80a6044e4757ad409ce39de2276fbfa826d72
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Aug 2013 14:55:54 +0800
Tag:    v2.6.0-beta

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

commit 8f9e51417e6fc1c721f4d98826886a65e2e28e61
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Aug 2013 14:33:06 +0800
Tag:    v2.6.0-beta

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

commit ba59a28305209eb5bb7121030fca9abc0005cefd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Aug 2013 14:25:20 +0800
Tag:    v2.6.0-beta

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

commit 8ba9df5862d85f942d3780ab40eecbc9490659f1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Aug 2013 13:11:04 +0800
Tag:    v2.6.0-beta

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

commit 6c416558dae58eafdf1827e173aa3bddd8ae6408
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Aug 2013 12:23:16 +0800
Tag:    v2.6.0-beta

Merge branch 'w35_MDL-41022_m26_unittests3' of https://github.com/skodak/moodle

commit 52ef7502d6fbc5fcd6a103d04061a152ec78ca8b
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 22 Aug 2013 11:17:49 +0800
Tag:    v2.6.0-beta

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

commit c44ff50cbc1f9db5e0c0dea917c1867613c63664
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 22 Aug 2013 10:40:47 +0800
Tag:    v2.6.0-beta

Merge branch 'debugdeveloperbitwisemess' of git://github.com/skodak/moodle

commit d7d2f263ddc288da030ddcee7eb4646ec37301f5
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 22 Aug 2013 10:32:54 +0800
Tag:    v2.6.0-beta

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

commit 695969987a208ed402c034a614f514b4b87e8acf
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 22 Aug 2013 10:14:21 +0800
Tag:    v2.6.0-beta

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

commit 915a6b411702322b5ae8b79499504f5bf397698e
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 22 Aug 2013 10:04:55 +0800
Tag:    v2.6.0-beta

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

commit 046514b7a2a5f89c61b3dc337464d6cc224a6427
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Aug 2013 15:17:44 +0800
Tag:    v2.6.0-beta

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

commit a101c7f011b111f4562d94f5639b85a81fd0c067
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Aug 2013 13:40:23 +0800
Tag:    v2.6.0-beta

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

commit 2af95c4b51a313ec8bfd043131060f35e2528637
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Aug 2013 13:36:02 +0800
Tag:    v2.6.0-beta

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

commit d99a3005639adf28c6aa8df88688a53482d591f9
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Aug 2013 11:35:27 +0800
Tag:    v2.6.0-beta

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

commit c3f5f4ab3710088bcacce04eb96328e5462dc93f
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Aug 2013 10:44:04 +0800
Tag:    v2.6.0-beta

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

commit c161e4687c6b5331415c4cd8f150e51f6543a986
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 18:21:17 +0800
Tag:    v2.6.0-beta

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

commit 144f35d9a25497cdc1081855a5e270c62f3accc9
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 17:51:18 +0800
Tag:    v2.6.0-beta

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

commit 43964b852a61ae10025086f06cb497512c6b5a38
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 17:10:05 +0800
Tag:    v2.6.0-beta

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

commit d5f8b7edc4b1eac1a4f356331f9fbc9baed1dae2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 17:03:47 +0800
Tag:    v2.6.0-beta

Merge branch 'w33_MDL-41094_m26_purgecleanup' of https://github.com/skodak/moodle

commit 6bbcf832c493f5a444610c21444fbd9474780682
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 16:44:09 +0800
Tag:    v2.6.0-beta

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

commit beccd9d4ffa161d7245f8086bd70d613534480c7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 16:34:18 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39770_chat' of https://github.com/andyjdavis/moodle

commit 51bfad5c91389eeac46fa920743a9b492fa62aae
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 16:07:12 +0800
Tag:    v2.6.0-beta

Merge branch 'w33_MDL-40952_m26_opcacheunit' of https://github.com/skodak/moodle

commit 7d7e0292cb2ec9942438dc0862ee1a43b8f11f9a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 15:13:02 +0800
Tag:    v2.6.0-beta

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

commit 1dae6515848e317fe12c7853d6eb870766919129
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 14:55:07 +0800
Tag:    v2.6.0-beta

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

commit d5b076a2cadc50d787d1054b4f8eaa1f6f47394b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 14:21:38 +0800
Tag:    v2.6.0-beta

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

commit 91a888df34209de579b68570c568f508ffdbd9e7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 12:38:08 +0800
Tag:    v2.6.0-beta

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

commit bfa4c3f3587bc7fe6d02eb4672de3ded751348a0
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 12:17:16 +0800
Tag:    v2.6.0-beta

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

commit 6f44a7336959bacba07db161ae47dac9bfc906c2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 11:42:03 +0800
Tag:    v2.6.0-beta

Merge branch 'w33_MDL-39474_m26_debugdeveloper' of https://github.com/skodak/moodle

commit 8ab325fb00cd4421956d8d8238ccacf6268088f3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 11:28:39 +0800
Tag:    v2.6.0-beta

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

commit 57cb5f5afa14a726cce35098b97cca6194bec869
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 11:07:53 +0800
Tag:    v2.6.0-beta

Merge branch 'WIP-MDL-36044-master' of git://github.com/nadavkav/moodle

commit 54a868d3beb0df5bfc3a66b8766df02261118eaf
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 10:59:31 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39236-master' of git://github.com/nadavkav/moodle

commit 9d66c2bb5bc5b47a8e9527b709abf828b4357e3d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 10:47:45 +0800
Tag:    v2.6.0-beta

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

commit 599d7d9bdfd21bbdf999378762d428ee84bad98d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Aug 2013 17:40:37 +0800
Tag:    v2.6.0-beta

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

commit c3b087ccc3a6be4083d2a76a8e46c238ba4e7842
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Aug 2013 14:50:01 +0800
Tag:    v2.6.0-beta

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

commit bee137b65ad3238b1407f58892fc85263d2230a1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Aug 2013 13:08:10 +0800
Tag:    v2.6.0-beta

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

commit a945d481275028b9b419abc71dfc0884b5049333
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Aug 2013 12:57:34 +0800
Tag:    v2.6.0-beta

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

commit 7031373ba89d2e12c382be5e338a2769a3bf1baf
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 15 Aug 2013 16:37:59 +0800
Tag:    v2.6.0-beta

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

commit 260ea3d9a1550a16cada70d8a752e89ffb4dfbda
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Aug 2013 15:38:37 +0800
Tag:    v2.6.0-beta

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

commit 02852c45b5797066dc9830f2991d8ed49f3f13ea
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Aug 2013 14:51:31 +0800
Tag:    v2.6.0-beta

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

commit 26e5090f9e77c5cb4f6323065f56e614b667adc8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Aug 2013 14:57:23 +0800
Tag:    v2.6.0-beta

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

commit f9b5915bc0d3e74523458e58a2bc8344bb2db815
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Aug 2013 13:23:31 +0800
Tag:    v2.6.0-beta

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

commit 387d040b7b62166f5e89f77c9b1e647e8719a064
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Aug 2013 11:14:37 +0800
Tag:    v2.6.0-beta

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

commit 4dca09b17750f2fcd3b3a10e3f5155021f95cdc8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Aug 2013 10:56:26 +0800
Tag:    v2.6.0-beta

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

commit 41e337dd82903dd47ec3602e56f032b94d40846b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Aug 2013 09:57:52 +0800
Tag:    v2.6.0-beta

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

commit 942a0e37d4510037c48dec339fecf90c98048f2e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Aug 2013 09:52:35 +0800
Tag:    v2.6.0-beta

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

commit 88ce8a1cb014b76041b3a9fbf17297e989114db9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Aug 2013 16:41:29 +0800
Tag:    v2.6.0-beta

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

commit e64f5d367aed4ef39d14be07ecd4284d9dc13381
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Aug 2013 15:54:53 +0800
Tag:    v2.6.0-beta

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

commit 7064ef523ba43c0cff1643681d675b469d6d9b99
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Aug 2013 14:27:35 +0800
Tag:    v2.6.0-beta

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

commit cb1268b109476770aa25bbe909c2be0eb40c86f0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Aug 2013 13:42:41 +0800
Tag:    v2.6.0-beta

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

commit df8cd014bedc09251e00138864f98d5847a3f457
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Aug 2013 13:29:17 +0800
Tag:    v2.6.0-beta

Merge branch 'w33_MDL-41019_m26_langcaches' of https://github.com/skodak/moodle

commit f8f6dbc37dd31fbc3f260ad8dc30e45a5f3d9a38
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Aug 2013 13:27:50 +0800
Tag:    v2.6.0-beta

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

commit f2b45ad65f2eff0bd1968e5e15953062c246d408
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Aug 2013 11:56:37 +0800
Tag:    v2.6.0-beta

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

commit 6d2fc575a615786c93869c3013d199b671d8b52f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Jul 2013 14:09:24 +0800
Tag:    v2.6.0-beta

Merge branch 'w31_MDL-39915_m26_tests' of https://github.com/skodak/moodle

commit 857e3ecb6ca771fac2ea8a444ef05a02b9ae5ec5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Jul 2013 14:06:04 +0800
Tag:    v2.6.0-beta

Merge branch 'w31_MDL-40898_m26_openhandles' of https://github.com/skodak/moodle

commit e4469ed8bfd29660002178901c8934bb6b53e0b8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Jul 2013 12:19:39 +0800
Tag:    v2.6.0-beta

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

commit d713ba95f02cea3539b712ece77eefa7bf7bee12
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Jul 2013 09:58:21 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40548' of https://github.com/Lightwork-Marking/moodle

commit ef3a268060f08b2c3ed906f1f932eb74a5a4b9c9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 16:56:40 +0800
Tag:    v2.6.0-beta

Merge branch 'w31_MDL-40900_m26_32unzip' of https://github.com/skodak/moodle

commit f7d374bd8f9d80d3851c0c2c99ba2860de78e774
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 16:49:39 +0800
Tag:    v2.6.0-beta

Merge branch 'w31_MDL-40887_m26_minify' of https://github.com/skodak/moodle

commit 0ae497f03ab1c4ac103ee1b416d6ec44e1825bd5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 16:29:59 +0800
Tag:    v2.6.0-beta

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

commit b47b4ffd912230774cd05477f9293136adfe0195
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 15:28:17 +0800
Tag:    v2.6.0-beta

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

commit 86005f488492832efbb339f8d3fece355c208d82
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 15:23:42 +0800
Tag:    v2.6.0-beta

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

commit 50aa2587a4418889f42f7d3df6162e43bc6a07a3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 14:14:58 +0800
Tag:    v2.6.0-beta

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

commit 48638b915deaa5cd2b1321486693b84c20e4ae06
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 13:59:55 +0800
Tag:    v2.6.0-beta

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

commit 8cb1af9a18d4d6b780ad2cbe75e7d9440efa19fd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 13:55:25 +0800
Tag:    v2.6.0-beta

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

commit 62ea0cb846e9bf0c2c5417c8d22c61e376dba40c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 13:48:19 +0800
Tag:    v2.6.0-beta

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

commit 30475270930267bd233e80370f6b3e633d1c9a05
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 13:45:50 +0800
Tag:    v2.6.0-beta

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

commit 0c69118fca50b7f2851037f0e8b233c84dbe2041
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 13:28:22 +0800
Tag:    v2.6.0-beta

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

commit 2c6f05581835c48dc83f531d42e4383dbafd0b43
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 13:20:59 +0800
Tag:    v2.6.0-beta

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

commit 90b423bda7a22fd2a3abdfdde65b1f2121f9292b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 12:40:05 +0800
Tag:    v2.6.0-beta

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

commit 245fb06b86f124ecda6c84bb53aba53a909fadcf
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 10:41:54 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40547' of https://github.com/Lightwork-Marking/moodle

commit 47c6239483156f9b76ff93c703866e5eb7d3c98a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 10:09:45 +0800
Tag:    v2.6.0-beta

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

commit d96fcecc86d7f9096ef20eb602070c9600e02151
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Jul 2013 16:44:32 +0800
Tag:    v2.6.0-beta

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

commit 80a1b08d40ce702cb4963ba98ee341f633f7372c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Jul 2013 16:41:45 +0800
Tag:    v2.6.0-beta

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

commit 5432ccec646b48ce34e634b5d8972afb03522ef7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Jul 2013 14:26:35 +0800
Tag:    v2.6.0-beta

Merge branch 'wip_MDL-40778_v2' of https://github.com/jamiepratt/moodle

commit 33b6da7f5968faecc7c099e7eb8b64c1c4f81dd7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Jul 2013 13:33:27 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40585_grouped_parent_exists' of git://github.com/mr-russ/moodle

commit 151d915c54f34929184888ea6e06e60fbaa106e8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Jul 2013 13:27:32 +0800
Tag:    v2.6.0-beta

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

commit 3ee8607d464997d0c5d5b6bb292d842987736902
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Jul 2013 12:35:41 +0800
Tag:    v2.6.0-beta

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

commit 35c117904736214c74cf82d813bccb29703f514d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Jul 2013 10:42:02 +0800
Tag:    v2.6.0-beta

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

commit 131580860b27cfa4c7b2d65a5e6c689b840a7f5e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Jul 2013 10:01:59 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-35674-form-dependencies' of https://github.com/andrewnicols/moodle

commit b3a570b56e100c8f60ac8834c7e7922f243cd2d0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Jul 2013 17:00:40 +0800
Tag:    v2.6.0-beta

Merge branch 'w30_MDL-38867_m26_gspell' of https://github.com/skodak/moodle

commit 7a3f9421cb397ffd06621c3c8e8d3b3c785b2be0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Jul 2013 15:47:48 +0800
Tag:    v2.6.0-beta

Merge branch 'w30_MDL-40545_m26_localcachedir' of https://github.com/skodak/moodle

commit 27e240078267fdb68a76fbf02f4752af9965a4de
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Jul 2013 15:01:26 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-38837_dev' of https://github.com/totara/openbadges

commit 82d1dc3f171d75ed2065144c5dbdb75c8d45f4cd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Jul 2013 14:36:29 +0800
Tag:    v2.6.0-beta

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

commit 51425cc045664b71fbaeb21b2ed75535c98b5fee
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Jul 2013 10:45:42 +0800
Tag:    v2.6.0-beta

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

commit 7bdae0924f6903e763a3d2eb54802b44eec12659
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Jul 2013 10:27:11 +0800
Tag:    v2.6.0-beta

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

commit 3a1b0dd9088d53d2a8b6483b25daac12feab92ed
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Jul 2013 16:57:07 +0800
Tag:    v2.6.0-beta

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

commit f6455e63ddf22ea563d3de5760664fe6c6717a9d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Jul 2013 16:52:52 +0800
Tag:    v2.6.0-beta

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

commit 58b2251be36be5d4d68efe287776e4a6fe551056
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Jul 2013 16:42:18 +0800
Tag:    v2.6.0-beta

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

commit 92e9260d964fac9182854a98a3d14c9100079292
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Jul 2013 16:00:12 +0800
Tag:    v2.6.0-beta

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

commit af578aec7c4f8d9eb83edda6e3d1bdf6546f09dd
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Jul 2013 15:55:20 +0800
Tag:    v2.6.0-beta

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

commit 9e40816b3a88919942d3d158516ef8b6698c40ef
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Jul 2013 15:49:45 +0800
Tag:    v2.6.0-beta

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

commit 0574cd90612d7e97c04006a85d3ee65bb7a6d152
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Jul 2013 15:47:07 +0800
Tag:    v2.6.0-beta

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

commit d06f10cf97f42e846e5a5201b4940f8e97374df1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Jul 2013 15:43:43 +0800
Tag:    v2.6.0-beta

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

commit bb0458aa7ce51f3ff9a7c504ddc2057bf5b4725e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Jul 2013 13:38:10 +0800
Tag:    v2.6.0-beta

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

commit 6f3c780f3b98c29354bed38dbb0c1e6a814e3e08
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Jul 2013 17:09:38 +0800
Tag:    v2.6.0-beta

Merge branch 'w27_MDL-40337_m26_rolescleanup' of https://github.com/skodak/moodle

commit 1e031a461691c34620a49a3494fb677eb472ba2a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Jul 2013 15:52:58 +0800
Tag:    v2.6.0-beta

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

commit fe6d32fcb3075e3c1d6d67db2ece864f4f142db3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Jul 2013 15:15:04 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40282' of github.com:colchambers/moodle

commit 6e4de306369b17344536c22fa86d25e1a2e7bcc2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Jul 2013 14:27:49 +0800
Tag:    v2.6.0-beta

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

commit 20cea2c57f54e3beb61389b32d8fec07998e25bb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Jul 2013 13:43:40 +0800
Tag:    v2.6.0-beta

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

commit b25cd1f3d55a96692fb4a59533af0248fe428004
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Jul 2013 13:34:09 +0800
Tag:    v2.6.0-beta

Merge branch 'w27_MDL-40399_m26_msarrayshift' of https://github.com/skodak/moodle

commit ad3ebb8f5f50f3c9d1f7bcfe427fe685c274ea7d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Jul 2013 09:55:20 +0800
Tag:    v2.6.0-beta

Merge branch 'w27_MDL-40266_m26_arrayshift' of https://github.com/skodak/moodle

commit 91d445db9a3835143868db4b025e6e1e94f40a1d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 01 Jul 2013 11:55:45 +0800
Tag:    v2.6.0-beta

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

commit 536a240891945bafcd0f3cb81781e5a30908a4aa
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 01 Jul 2013 11:21:47 +0800
Tag:    v2.6.0-beta

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

commit ba045b31a7f927bffafb394ae7ef51e74b2689ca
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 21 Jun 2013 13:23:21 +0800
Tag:    v2.6.0-beta

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

commit 0ea73a5524248178c228fb470607dae3c796e742
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 19 Jun 2013 15:47:08 +0800
Tag:    v2.6.0-beta

Merge branch 'fix_classloading8' of git://github.com/skodak/moodle

commit 6ef007def689147e3901df32b41f7e29f5cc7e44
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Jun 2013 16:47:18 +0800
Tag:    v2.6.0-beta

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

commit c0fb582c58f81122d9f3f9e63d27c7077542a85f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Jun 2013 13:10:24 +0800
Tag:    v2.6.0-beta

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

commit 0afca44627a78e283a009f1bbb2e73c6f55f5207
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Jun 2013 10:42:33 +0800
Tag:    v2.6.0-beta

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

commit 83b8e822f1ad7c93b254bb125617781cb0a3dc40
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Jun 2013 10:35:47 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-33105' of https://github.com/ppichet/moodle

commit e9d011250e39469ecaec2a3af60c425f7f0c2cec
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Jun 2013 17:02:11 +0800
Tag:    v2.6.0-beta

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

commit 85db00e0c3b9318d7d3a5bb18a96de9130858bc2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Jun 2013 16:40:24 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39825_dev_master' of https://github.com/totara/openbadges

commit af08eb991292e55db607fc2fed7b7fb1abb41c2a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Jun 2013 15:36:15 +0800
Tag:    v2.6.0-beta

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

commit 877bb8294c7c7bbf5553f242913ac12d2122bc5a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Jun 2013 14:53:19 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-31680' of https://github.com/ppichet/moodle

commit e00916d933d7a90667eae451fd895d66ca204ec2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Jun 2013 13:37:18 +0800
Tag:    v2.6.0-beta

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

commit e3b472e82c02cc4b7718e44196d4a52e0ca4c3f3
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 13 Jun 2013 10:15:25 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-38359-master' of git://github.com/danmarsden/moodle

commit 19c1e0b80a9156d84f9b579dba22fd305d7e6cfb
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 12 Jun 2013 16:49:29 +0800
Tag:    v2.6.0-beta

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

commit 85937391e16faee03a66e6ee2b8d3ca5c2de398e
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 12 Jun 2013 16:47:38 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-38359-master' of git://github.com/danmarsden/moodle

commit bdce4a9cca501a356d263c8f7f94be8c9fe9206c
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 12 Jun 2013 13:56:39 +0800
Tag:    v2.6.0-beta

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

commit 1899145c5014913959ad207f119003d4788b6aba
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 12 Jun 2013 09:33:23 +0800
Tag:    v2.6.0-beta

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

commit e2ac6a848b5410aef725fefd0f6f541b79084513
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Jun 2013 16:00:18 +0800
Tag:    v2.6.0-beta

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

commit 75eb51818cf505a5a63132d182aebb18a06ddd27
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Jun 2013 15:41:11 +0800
Tag:    v2.6.0-beta

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

commit 2504dfd61d1b5c0b269aaee7b200a46ebe9d60cc
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Jun 2013 15:38:37 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39155' of https://github.com/jacks92/moodle

commit f7ec3b43a74da6a22dee47c78af7936e1042d44a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Jun 2013 15:34:48 +0800
Tag:    v2.6.0-beta

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

commit 6217bb5b8d6be8f0a4d013e06f8bd08b18b24acd
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Jun 2013 15:31:20 +0800
Tag:    v2.6.0-beta

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

commit 3873f6aa6018a51395be13dec8d8b2d307153619
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Jun 2013 14:09:12 +0800
Tag:    v2.6.0-beta

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

commit 47cddbed5c63fc97c89a5c05048cdded668debed
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Jun 2013 13:05:25 +0800
Tag:    v2.6.0-beta

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

commit b6174c9897faffe2cf2de62206986b7dd6815ded
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Jun 2013 12:54:24 +0800
Tag:    v2.6.0-beta

Merge branch 'm26_MDL-40002_ETag_value_must_be_a_quoted-string' of https://github.com/scara/moodle

commit fd6f924c0877a9013da4ccda26113d319b0cfe43
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Jun 2013 11:24:31 +0800
Tag:    v2.6.0-beta

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

commit 50b5ae4a8d8cbb230422fcbb3c669157d223a895
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 16:19:56 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39947' of https://github.com/aolley/moodle

commit c6898e629b4fb267eaaf609c59c6f891f22d5268
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 16:06:22 +0800
Tag:    v2.6.0-beta

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

commit 0a006517e5620f32e8a22fddcb43103992e5b134
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 15:42:45 +0800
Tag:    v2.6.0-beta

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

commit f4c824c0096e213dac9adb206013dfb0bba49b28
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 15:28:17 +0800
Tag:    v2.6.0-beta

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

commit de235efba4804822ca0b4c9bd316c404c965e156
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 15:00:08 +0800
Tag:    v2.6.0-beta

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

commit bb179ab9b4d9972c67268048aae1cf7b72bbd935
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 14:57:48 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40013_master' of git://github.com/oasychev/moodle

commit 70913901645389a77a059bee54aee718f8f85e2b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 14:41:20 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40080-unused-hub-strings' of git://github.com/mudrd8mz/moodle

commit 8a78b9116a8b509f34858c9ab1fd1a27114dd270
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 14:25:03 +0800
Tag:    v2.6.0-beta

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

commit 28fa1533f70ee3824695588bc4ab9ae37d03b40c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 13:12:11 +0800
Tag:    v2.6.0-beta

Merge branch 'w24_MDL-39096_m26_obfuscate' of git://github.com/skodak/moodle

commit 664a1e2793585f02be2f02fad429f9dfab01a8a3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 12:16:37 +0800
Tag:    v2.6.0-beta

Merge branch 'w24_MDL-28394_m26_enrolrestore' of git://github.com/skodak/moodle

commit bed1bc3ddcb8aac2c0d343b326a5bc87550f9230
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 12:09:47 +0800
Tag:    v2.6.0-beta

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

commit 3178aacd9efdb692c1991af71736ad0e78a21d4d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 11:59:03 +0800
Tag:    v2.6.0-beta

Merge branch 'w24_MDL-37974_m26_manexpire' of git://github.com/skodak/moodle

commit 07bac478b6239246c534a48c73240cf66ad1d576
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 10:54:22 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-39824-m26' of http://github.com/samhemelryk/moodle

commit 348cebac1c9b9192724b34dde0ad87fd3f477398
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 06 Jun 2013 11:54:47 +0800
Tag:    v2.6.0-beta

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

commit 1caff55c2ca9815d0c9c34033c598cf88af14aa0
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Jun 2013 13:10:12 +0800
Tag:    v2.6.0-beta

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

commit c05660fc35c879dbc78ebd55b6b607095f331c59
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Jun 2013 10:11:42 +0800
Tag:    v2.6.0-beta

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

commit dd03ed1051129a11f03594ebd5608e38f2ad7d9b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 15:53:56 +0800
Tag:    v2.6.0-beta

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

commit 20fe8676ea3709c2cb24e214ddeae9535f9920d0
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 14:44:35 +0800
Tag:    v2.6.0-beta

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

commit 93ab0810256cf90b05e237391088470e96092b2d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 14:37:55 +0800
Tag:    v2.6.0-beta

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

commit e404e040d345efdab85b198e24ab3ea72e8a7612
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 14:14:18 +0800
Tag:    v2.6.0-beta

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

commit 42d00d363896c53e2b360124b2800d1d3790fec1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 13:31:34 +0800
Tag:    v2.6.0-beta

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

commit 7f639dd35281eba1b27355021e01060d73733491
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 13:18:49 +0800
Tag:    v2.6.0-beta

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

commit 984dc35457e3a0fd4bc72791e6c54ec9530aaef2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 12:27:30 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39939-scorm-basic-report-name' of git://github.com/mudrd8mz/moodle

commit 4dfadbc99b5e4e53d2e2ec56e55ae902a49a753f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 11:29:38 +0800
Tag:    v2.6.0-beta

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

commit ea746c01668a1e832fb6d2612a0627bdee1f0310
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 11:26:28 +0800
Tag:    v2.6.0-beta

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

commit 0d9121a1c44bda6d0cce226f8f54f461c7730367
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 11:03:39 +0800
Tag:    v2.6.0-beta

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

commit 820b66be5887dc7c7650b8589a585ad64de62c6e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 10:42:45 +0800
Tag:    v2.6.0-beta

Merge branch 'wip_master_mdl-34085' of https://github.com/iarenaza/moodle

commit 550e8d5bc76dae67a08ed446fea730a65855ba74
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 27 May 2013 14:36:46 +0800
Tag:    v2.6.0-beta

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

commit 92e24958e54bb138e5c00968e63a39750f7ecdff
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 27 May 2013 14:17:00 +0800
Tag:    v2.6.0-beta

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

commit 87787191e44d6f8aaa8e4637b13c87bea38bdfa8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 27 May 2013 14:04:04 +0800
Tag:    v2.6.0-beta

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

commit 5584adfe70a7e5d3314f715c1b13b3fca586228b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 27 May 2013 13:43:13 +0800
Tag:    v2.6.0-beta

Merge branch 'w22_MDL-39688_m26_etag' of git://github.com/skodak/moodle

commit cce01b49c1180c7dcfc5822e66d27ba943c8c0b3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 27 May 2013 13:04:45 +0800
Tag:    v2.6.0-beta

Merge branch 'w22_MDL-38408_m26_paypalcost' of git://github.com/skodak/moodle

commit 047a79baed7b6a235895c384e09389c21bae6f6c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 27 May 2013 10:18:21 +0800
Tag:    v2.6.0-beta

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

commit ec969f891f0c8fa55c07aa5cdfbd20d37510e696
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 May 2013 12:30:11 +0800
Tag:    v2.6.0-beta

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

commit a22b8a83e75cba4fe93392d162922a7f878d22b5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 May 2013 10:58:37 +0800
Tag:    v2.6.0-beta

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

commit 2f6568796af1efa42ab4c769ff7632190c955f96
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 May 2013 10:43:34 +0800
Tag:    v2.6.0-beta

Merge branch 'wip_master_mdl-39323_fix_start_tls_undefined_notice' of https://github.com/iarenaza/moodle

commit ef78682e4478cdd04f1821eae7031f65f3f16c55
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 May 2013 17:58:09 +0800
Tag:    v2.6.0-beta

Merge branch 'w18_MDL-39374_m26_folderlog' of git://github.com/skodak/moodle

commit 9e95723c609712f3c382fc71154da92e02046085
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 May 2013 16:08:51 +0800
Tag:    v2.6.0-beta

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

commit d6aec96dd5a95eca591ec333759e384b34cf425f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 May 2013 15:46:49 +0800
Tag:    v2.6.0-beta

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

commit 7ae324cb350f1d28e330c71fd17664a9c5f0da59
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 May 2013 15:28:31 +0800
Tag:    v2.6.0-beta

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

commit b04bfcfc543d904003c4369be3f4bd96823513d0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 May 2013 12:42:17 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-36020-master' of git://github.com/troylee/moodle

commit 2f75633c6fb9533613ab6e56abe1612bacc3cabe
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 May 2013 12:01:01 +0800
Tag:    v2.6.0-beta

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

commit 02f92b2d8606c0f6903edb8f2dbe01ac011ba490
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 May 2013 11:47:50 +0800
Tag:    v2.6.0-beta

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

commit 22c8aeb018fd9a70ee52dbc2d5a748c238e38c58
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 May 2013 10:25:08 +0800
Tag:    v2.6.0-beta

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