Git merges in Moodle 2.6.0 by Eloy Lafuente (stronk7)

commit ad9e81eb981eaa1cbf40b1aa0ebc70c2a5ddbcd9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 15 Nov 2013 23:06:22 +0800
Tag:    v2.6.0

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

commit a3d0f7c7924c3bfd0ab56a49224f6d133d84dbeb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 15 Nov 2013 18:17:55 +0800
Tag:    v2.6.0-rc1

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

commit 9a36c7d95c723c2f5e08acf184f40af3bbb20eff
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 15 Nov 2013 09:11:27 +0800
Tag:    v2.6.0-rc1

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

commit 234159ee9de524ce8415260d5173cf19bb7288ba
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 15 Nov 2013 09:04:45 +0800
Tag:    v2.6.0-rc1

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

commit a269acfef7beac743d0ce6a889767f27f04c76d8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 15 Nov 2013 06:24:20 +0800
Tag:    v2.6.0-rc1

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

commit 30d0332f0034b78edc63640a5374e197f466ab56
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 15 Nov 2013 06:22:26 +0800
Tag:    v2.6.0-rc1

Merge branch 'w47_MDL-42860_m26_dbsess' of https://github.com/skodak/moodle

commit 529d3bad0e7f127372574498c201aaa7f841383f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 14 Nov 2013 06:15:23 +0800
Tag:    v2.6.0-rc1

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

commit 474719d327fb5b5a7ccfff87136b963941f3a307
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 14 Nov 2013 06:09:09 +0800
Tag:    v2.6.0-rc1

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

commit 662c5263b03ff1762733066a4032f92f0e786b2e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Nov 2013 08:55:52 +0800
Tag:    v2.6.0-rc1

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

commit 56581299679933e6d1f27d53862a4c4bd366595b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Nov 2013 08:12:27 +0800
Tag:    v2.6.0-rc1

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

commit 64dcfd6ea3eb69b95287835a473fcffb13c0baaa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Nov 2013 08:09:49 +0800
Tag:    v2.6.0-rc1

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

commit 183f84b5c31f9eb3762d427c8f5bebf21ace1b48
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Nov 2013 08:03:09 +0800
Tag:    v2.6.0-rc1

Merge branch 'wip_master_mdl-42723' of https://github.com/iarenaza/moodle

commit aa7bc816d9c7bda38eabe4c61f817664b4d7bf42
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Nov 2013 03:07:05 +0800
Tag:    v2.6.0-rc1

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

commit 201877b5d04c9a4ef324e3264a434442750e0324
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Nov 2013 10:27:22 +0800
Tag:    v2.6.0-rc1

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

commit 5d875d18e00454e74223a17a82efb2360ebb0fdc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Nov 2013 07:38:35 +0800
Tag:    v2.6.0-rc1

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

commit e916eb407c2cf85d78d47a84d9783e9761158535
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Nov 2013 06:35:37 +0800
Tag:    v2.6.0-rc1

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

commit 233db99d65838b8c891388b6ba68714b9cca8ca7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 06 Nov 2013 00:27:04 +0800
Tag:    v2.6.0-rc1

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

commit 27ee4c13a51a4abdcb746c9ae0b694d73f4514ef
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 25 Oct 2013 07:14:04 +0800
Tag:    v2.6.0-rc1

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

commit 7419751a4c05d32144474c6e98288f6ed7e8376a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 25 Oct 2013 07:09:25 +0800
Tag:    v2.6.0-rc1

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

commit 20ddc0c9cfbfcde9d807a50f33d5d696d8b61b39
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 25 Oct 2013 05:35:24 +0800
Tag:    v2.6.0-rc1

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

commit c783a415dca14721658110ea1a1104d0a1c20c18
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 25 Oct 2013 05:33:42 +0800
Tag:    v2.6.0-rc1

Merge branch 'w43_MDL-42442_m26_standardwhite' of https://github.com/skodak/moodle

commit d0285a0d9175cef73776326c51c428187de99d10
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 25 Oct 2013 05:27:11 +0800
Tag:    v2.6.0-rc1

Merge branch 'w43_MDL-42206_m26_metaedit' of https://github.com/skodak/moodle

commit bf928b293355185806d9fda8872acc17abcfe411
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Oct 2013 18:14:29 +0800
Tag:    v2.6.0-rc1

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

commit 059d7bd27547cf9bd716620e46a466fac65fb4a0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Oct 2013 21:19:36 +0800
Tag:    v2.6.0-beta

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

commit 11182e2eb1020fc63e91bc9526e72293dd7770ed
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Oct 2013 07:23:01 +0800
Tag:    v2.6.0-beta

Merge branch 'w42_MDL-42224_m26_msgredir' of https://github.com/skodak/moodle

commit 77631383f0c29c70bb4c8deefada8034a62bec00
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Oct 2013 07:04:36 +0800
Tag:    v2.6.0-beta

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

commit e60637052c6f4c7a945473812b9321c62d6eb73e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Oct 2013 06:39:46 +0800
Tag:    v2.6.0-beta

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

commit 9bb34fb7816bb6e17ede90d8e27580c6d3780e94
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 15 Oct 2013 08:09:11 +0800
Tag:    v2.6.0-beta

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

commit 3745472f635f92441c3d8d317410b645add2b9ad
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 15 Oct 2013 07:58:51 +0800
Tag:    v2.6.0-beta

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

commit 7d766e4ca16db8d4effb28c59149f31d6bdcc41f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Oct 2013 06:13:26 +0800
Tag:    v2.6.0-beta

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

commit b1636b4a8b2f0c4c50cb0df7528d7f27058fc2af
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Oct 2013 05:32:30 +0800
Tag:    v2.6.0-beta

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

commit 04e49ead57193c9b18f3ed17cf7dcc20fc6ec421
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Oct 2013 05:19:18 +0800
Tag:    v2.6.0-beta

Merge branch 'w42_MDL-42243_m26_filtersettings' of https://github.com/skodak/moodle

commit f71011e825a92b501b0e7c618fedf84b5dfaed8e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Oct 2013 05:09:53 +0800
Tag:    v2.6.0-beta

Merge branch 'w42_MDL-42292_m26_blockversion' of https://github.com/skodak/moodle

commit 6ad40de4652dc77b31fb390ffdd199baab0dd724
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Oct 2013 00:30:49 +0800
Tag:    v2.6.0-beta

Merge branch 'w42_MDL-41935_m26_timediff' of https://github.com/skodak/moodle

commit 3ed255dc1a2f789fb05e005ad5d18fc910917ef6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 Oct 2013 07:33:21 +0800
Tag:    v2.6.0-beta

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

commit 4d4396c3b81151de19bdd3acd6988b9e1cc39fa0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 Oct 2013 06:47:30 +0800
Tag:    v2.6.0-beta

Merge branch 'w41_MDL-41953_m26_componentnumbers' of https://github.com/skodak/moodle

commit 7e9dadfd99c05dfe9a4437d07f4e3b979fd52ee6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Oct 2013 07:48:45 +0800
Tag:    v2.6.0-beta

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

commit 8fe9bbde098f07cce9dd37e30bdd28588136bec6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Oct 2013 07:29:17 +0800
Tag:    v2.6.0-beta

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

commit 38c6dc4313e392130fc9b9d8c1a479803d00b9ce
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Oct 2013 07:26:52 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-42068-m26-showshortnamefilepicker' of git://github.com/henesnarfel/moodle

commit 7d19bc135372f5e0dc98776871b0287b9b7353da
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Oct 2013 03:25:46 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-42069' of https://github.com/appalachianstate/moodle

commit cef0f4203b54d6c60aa74485c2d4d91fc0c4406e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Oct 2013 03:23:56 +0800
Tag:    v2.6.0-beta

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

commit 467fc039826a2b3d902517ec3839e73354453c1e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 08 Oct 2013 16:53:03 +0800
Tag:    v2.6.0-beta

Merge branch 'w41_MDL-42199_m26_rev' of https://github.com/skodak/moodle

commit e68ff1ec32943e0419077bd4731d8cdeae027c38
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 07 Oct 2013 22:06:32 +0800
Tag:    v2.6.0-beta

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

commit 9d4ff1e5f40178adb3ca8e17f33a1601f9f6c2ed
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Oct 2013 06:26:20 +0800
Tag:    v2.6.0-beta

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

commit 3667a8ce7f26788fe1beec470735a2b88b3ead68
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Oct 2013 05:59:05 +0800
Tag:    v2.6.0-beta

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

commit d1ed736f1de7ae7f28d28dd72733ccb8d2aee6f9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Oct 2013 05:42:00 +0800
Tag:    v2.6.0-beta

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

commit 268f4cb5038a7de8bbed6c0fe098c214d6922297
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Oct 2013 02:08:25 +0800
Tag:    v2.6.0-beta

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

commit 098723aabb69854d08285dc56bcee949ffb6a9ab
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Oct 2013 02:01:33 +0800
Tag:    v2.6.0-beta

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

commit 46e11c669022d42aeee558c03788b5ba9d4d420e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Oct 2013 01:55:30 +0800
Tag:    v2.6.0-beta

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

commit e360a68adc727447e557b8e07826f19c3cc6518e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Oct 2013 01:50:19 +0800
Tag:    v2.6.0-beta

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

commit da600e53141fdfea8817213738dc75ddd0612836
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Oct 2013 01:43:42 +0800
Tag:    v2.6.0-beta

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

commit 52e9827495740cd9937edb90e2754c087c7455a6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Oct 2013 01:41:10 +0800
Tag:    v2.6.0-beta

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

commit 164e90dd70726c1c342cafc20c4f6c311d377276
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Oct 2013 01:36:37 +0800
Tag:    v2.6.0-beta

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

commit 91c49b8cf4302b0a0ee6d847e4747158b4ae7e5f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Oct 2013 01:18:36 +0800
Tag:    v2.6.0-beta

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

commit 00a6df6b028280446c105c4ca1e7a98582839f0d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 01 Oct 2013 21:59:06 +0800
Tag:    v2.6.0-beta

Merge branch 'w40_MDL-41999_m26_userpw' of https://github.com/skodak/moodle

commit b744b90df54b3ed026b7cd6a47a695fb6b686806
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 01 Oct 2013 08:14:23 +0800
Tag:    v2.6.0-beta

Merge branch 'w40_MDL-41707_m26_exttests' of https://github.com/skodak/moodle

commit b1698e9ac578081797abe13bd52bf41aecce23bc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 01 Oct 2013 07:52:53 +0800
Tag:    v2.6.0-beta

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

commit 94211c02c33ef93e4be6c0f0161c750b8bb3aa51
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 01 Oct 2013 03:55:41 +0800
Tag:    v2.6.0-beta

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

commit 833d1eb0e2ab3cf306c93d8080e8ee439b0ba1c7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 30 Sep 2013 22:01:38 +0800
Tag:    v2.6.0-beta

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

commit 6da8594018a2cd5013490455e4fc1ab59867238d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 26 Sep 2013 05:48:42 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40811-master-behat' of https://github.com/andrewnicols/moodle

commit c72cad1f85e01fd8382b64260f91969b6780643f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 19:36:40 +0800
Tag:    v2.6.0-beta

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

commit a07a9c74de68971c259fb6fa50bb0307aed1a313
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 17:41:45 +0800
Tag:    v2.6.0-beta

Merge branch 'w39_MDL-41208_m26_yui312' of https://github.com/skodak/moodle

commit 1d453eff25dd596c7b1d2c62330b708abefb4311
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 09:09:51 +0800
Tag:    v2.6.0-beta

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

commit 75c7c412831707ca2b15e93f1d5ae69e429f2e82
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 08:38:34 +0800
Tag:    v2.6.0-beta

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

commit 14976b35687e12241b03eaa73cc34eb01aaafdc6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 08:33:30 +0800
Tag:    v2.6.0-beta

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

commit 25e02ab6ee641ceeae97c74ac19574f15ec12d91
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 08:14:57 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41660-imscc-tempdir' of https://github.com/mpetrowi/moodle

commit a18daae62b173f9f7b60d782e2eb40362f91efcf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 08:11:51 +0800
Tag:    v2.6.0-beta

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

commit 109d6fe29014c4db7e647d9e2d761ad6d0841e67
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 08:00:22 +0800
Tag:    v2.6.0-beta

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

commit 24262f59481a65522a839f4d7e825c8e43c5273e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 07:01:23 +0800
Tag:    v2.6.0-beta

Merge branch 'master_MDL-41806' of git://github.com/totara/moodle

commit 007b803b4a014acf4d4a75eeec0d6a45e49241f1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 06:27:57 +0800
Tag:    v2.6.0-beta

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

commit 81eba750d4f5ad1e4921cf152b4c837a4da684da
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 05:23:15 +0800
Tag:    v2.6.0-beta

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

commit bbfa86fe483976248bbe0147ea2d63e2ca8265c6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 05:20:53 +0800
Tag:    v2.6.0-beta

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

commit 18ccaca2e2d125ab084a5f8a40ed222ecbd1d752
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 05:13:50 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41726-master-2nd' of git://github.com/FMCorz/moodle

commit 161f995849e552964c53e456165fd31c4952ed79
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 02:18:03 +0800
Tag:    v2.6.0-beta

Merge branch 'w39_MDL-41437_m26_mia' of https://github.com/skodak/moodle

commit dd0fa1adb1cf26205867c4158f3f034de90644d8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Sep 2013 20:05:10 +0800
Tag:    v2.6.0-beta

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

commit fe64d4f7c8df0ad5a9e21e80fc75d6de29231d8e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Sep 2013 04:05:26 +0800
Tag:    v2.6.0-beta

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

commit 9ea4eedf227076e34b8760e29beba94713999eea
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Sep 2013 23:09:25 +0800
Tag:    v2.6.0-beta

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

commit cae8956648259eb7b5fbb215056d98eb604e09b6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Sep 2013 21:44:31 +0800
Tag:    v2.6.0-beta

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

commit abef633c33c944387a72e129f1a36ab57ee479f2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Sep 2013 03:57:07 +0800
Tag:    v2.6.0-beta

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

commit 5c34952b821bafc9c8ace3c43b00db9ad8947ec9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Sep 2013 03:22:30 +0800
Tag:    v2.6.0-beta

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

commit cfcd93dd11d7335ff0b5116f2954fbd3a0dc9920
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Sep 2013 03:17:05 +0800
Tag:    v2.6.0-beta

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

commit e79ca991fb7be80d8179c749f21fb41e789174e6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Sep 2013 03:11:26 +0800
Tag:    v2.6.0-beta

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

commit e60756632aa97794cebb9ce6d4256c0034173f6e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Sep 2013 02:22:32 +0800
Tag:    v2.6.0-beta

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

commit 1ee2fb5a11b1d622502f08ea3f68785d84edd458
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Sep 2013 02:04:08 +0800
Tag:    v2.6.0-beta

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

commit 58c9faeaca7213fe284b7999fc77bff313d90582
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Sep 2013 01:59:55 +0800
Tag:    v2.6.0-beta

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

commit ba57caa349c2f2589ce32f7ac5df277167847a73
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 Sep 2013 08:15:06 +0800
Tag:    v2.6.0-beta

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

commit a13f06aec03a3caf6559c4d6f9aa253bfb1226ef
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 11 Sep 2013 05:45:20 +0800
Tag:    v2.6.0-beta

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

commit f073ea045eb4416048faface27e273a0d2502b0a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 10 Sep 2013 20:16:14 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-41288-fix' of git://github.com/marinaglancy/moodle

commit 34ac96bf6d42463e3a869aefd7aa9bbb34887745
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 10 Sep 2013 20:09:34 +0800
Tag:    v2.6.0-beta

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

commit 5cfcc6a981f4991bfca6969051e87ca553973ef4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 07 Sep 2013 20:13:55 +0800
Tag:    v2.6.0-beta

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

commit f87559946253e7e8ef7ec1e987ae61095779db8e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Sep 2013 07:08:37 +0800
Tag:    v2.6.0-beta

Merge branch 'w36_MDL-41267_m26_toolsubplugins' of https://github.com/skodak/moodle

commit df7995e3a0df0b800daaaa16e0a75d47ff445bb5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Sep 2013 07:01:19 +0800
Tag:    v2.6.0-beta

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

commit 58c80b03a85ef64e041f9784e1a37cd00949e6ef
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Sep 2013 02:38:53 +0800
Tag:    v2.6.0-beta

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

commit f82a082ae2609d3e45fe0546ec20bd93e095e203
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Sep 2013 21:12:19 +0800
Tag:    v2.6.0-beta

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

commit e034d84c4897d78cc711411e72d407625a57a209
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 02 Sep 2013 22:56:50 +0800
Tag:    v2.6.0-beta

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

commit 5c451460073dbeff9f625f6e25c5e3545ebb5b7c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 28 Aug 2013 03:00:12 +0800
Tag:    v2.6.0-beta

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

commit c718b49bfcf41ee7e66418bfc80dc45848dae100
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 28 Aug 2013 01:45:24 +0800
Tag:    v2.6.0-beta

Merge branch 'm26_MDL-41410_Move_Comment_To_Appropriate_Place' of https://github.com/scara/moodle

commit 154bc6b240e9e4652cad829df6f60bca28b2d996
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 05:42:11 +0800
Tag:    v2.6.0-beta

Merge branch 'w30_MDL-40642_m26_umask' of https://github.com/skodak/moodle

commit 8f9b2980b783adb52fb842adb87d875483a08d10
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 05:21:38 +0800
Tag:    v2.6.0-beta

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

commit 7613bc7c3a5ea1f3242d0bc8a4fdf8441bd9c16b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 05:06:35 +0800
Tag:    v2.6.0-beta

Merge branch 'w30_MDL-40801_m26_jquery' of https://github.com/skodak/moodle

commit 8c573a95364c585b41d1cc9be767e28ca8354f00
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 05:04:13 +0800
Tag:    v2.6.0-beta

Merge branch 'w30_MDL-40627_m26_extramemorylimit' of https://github.com/skodak/moodle

commit ae2605ec8d73e8da4b420bfcdc5b9f2629899d38
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 04:56:34 +0800
Tag:    v2.6.0-beta

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

commit 01994ecee98c7974398962550b7cb33e2984fc67
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 04:39:13 +0800
Tag:    v2.6.0-beta

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

commit 6aa9735cb0c2065eaefdb2f04b6479e541c9128e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 04:34:16 +0800
Tag:    v2.6.0-beta

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

commit 6abf3556fd8e1c34abf6a336e1c5a0e962813d82
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 04:28:54 +0800
Tag:    v2.6.0-beta

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

commit 172dda0090d5ff8f9421e633a0b724416a7a99cc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 04:10:08 +0800
Tag:    v2.6.0-beta

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

commit 18c4d7e68cc8eae1d5ce503adabb8e77c425817a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 02:32:40 +0800
Tag:    v2.6.0-beta

Merge branch 'w30_MDL-40723_m26_creators' of https://github.com/skodak/moodle

commit cbc4aa8cfe68e13fcf43859ac8d3949ce4ce5aaf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 02:29:43 +0800
Tag:    v2.6.0-beta

Merge branch 'w30_MDL-40796_m26_citycountry' of https://github.com/skodak/moodle

commit 070a1bf23fe11397da0d8679e04ec1e5a2b37781
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 00:58:03 +0800
Tag:    v2.6.0-beta

Merge branch 'w30_MDL-40809_m26_olduserimages' of https://github.com/skodak/moodle

commit 288ba37a56f45f4dfe5cc7c9b502619023cd314c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 00:20:50 +0800
Tag:    v2.6.0-beta

Merge branch 'w30_MDL-40679_m26_zlib' of https://github.com/skodak/moodle

commit 79143f1e597531fc00de6b3b653bb0df51c5562e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 00:18:52 +0800
Tag:    v2.6.0-beta

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

commit 30a209ba1762c33f1719bbe2d96bcc4e3629115a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 23:50:38 +0800
Tag:    v2.6.0-beta

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

commit 97c51dfb2236527f6004923fd1b4683121f94173
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 23:45:22 +0800
Tag:    v2.6.0-beta

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

commit 2c72cc23b2ce21881f80fcb95603074e38b9facf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 23:17:13 +0800
Tag:    v2.6.0-beta

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

commit 9e1e94aafab6ac9581b5f37e75983fcbf2b11a50
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 19:58:20 +0800
Tag:    v2.6.0-beta

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

commit aa837b2fe65221c2c436b6f35b7b7fcce6c3e4d9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 19:50:06 +0800
Tag:    v2.6.0-beta

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

commit 8c2ed5704382ca5a58aaeb63037f5253193b4a21
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 19:19:41 +0800
Tag:    v2.6.0-beta

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

commit d4731fd002bb8b2e1e93d1eb71ceefc659719e08
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 18:52:50 +0800
Tag:    v2.6.0-beta

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

commit 3b117e79ce4092fc578897072586885468dd7c5d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 18:16:11 +0800
Tag:    v2.6.0-beta

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

commit 4238060a9b1a342e91082c6e7b56b6e255b9ae09
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 09:52:16 +0800
Tag:    v2.6.0-beta

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

commit 6d0085ef2447c88ee171749c61eb4f5f247128f2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 06:48:47 +0800
Tag:    v2.6.0-beta

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

commit 63ff2c5c2faca20c419319782abc20d4c08e49c5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 06:45:13 +0800
Tag:    v2.6.0-beta

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

commit f2515968d2ae776f351c8aa46f80aa16cdae61fa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 04:36:23 +0800
Tag:    v2.6.0-beta

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

commit 59af378baf1262be95c83e902dab16f8616b1ed0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 00:56:40 +0800
Tag:    v2.6.0-beta

Merge branch 'w30_MDL-40795_m26_ajaxerrordisplay' of https://github.com/skodak/moodle

commit 252e545e9fbc5c1d523955e3fab47358c5a94d63
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 22 Jul 2013 23:40:03 +0800
Tag:    v2.6.0-beta

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

commit dbdfd37709a5df194bd9cfda3ce352e5ad5b7448
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 19 Jul 2013 02:22:47 +0800
Tag:    v2.6.0-beta

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

commit fb1788c598b4e3076492ad50de72a2734e0ddcdf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 07:21:51 +0800
Tag:    v2.6.0-beta

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

commit 68d9f1327306b12aab6c908dc90d52b16bf50b2b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 07:13:17 +0800
Tag:    v2.6.0-beta

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

commit 0b3af0798c291d7796ec6f910a2650b3a20f7f55
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 07:07:21 +0800
Tag:    v2.6.0-beta

Merge branch 'w29_MDL-40220_m26_core_component' of https://github.com/skodak/moodle

commit afda9e227926ced24d3278f754a662abecd6660e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 06:58:26 +0800
Tag:    v2.6.0-beta

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

commit a6149155c0efee649452adf94b852e8301f9947b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 06:43:45 +0800
Tag:    v2.6.0-beta

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

commit f28051143f45c35afe33430e47df524a2207ae60
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 06:41:15 +0800
Tag:    v2.6.0-beta

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

commit 2be11851321a1397eaa2ec82150f6116fddcaae0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 06:32:32 +0800
Tag:    v2.6.0-beta

Merge branch 'w29_MDL-40611_m26_accesslibtest' of https://github.com/skodak/moodle

commit b8d73bd58e317e22b76d3b875835d17dfcc0d47e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 06:30:13 +0800
Tag:    v2.6.0-beta

Merge branch 'w29_MDL-40546_m26_jscache' of https://github.com/skodak/moodle

commit a9802619840c45edd4119825503988b548c8895a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 06:24:10 +0800
Tag:    v2.6.0-beta

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

commit 660ee07b60a305602d7e212eae83935c417d6945
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 06:22:15 +0800
Tag:    v2.6.0-beta

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

commit 3742ee163b3c90e73abe389cf634f71095e91863
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 06:17:30 +0800
Tag:    v2.6.0-beta

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

commit 55fcd9323e95aabe7c74d0d2883b8e4fed8e05fc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 04:02:18 +0800
Tag:    v2.6.0-beta

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

commit e28ae962be4601928f0d2dc90dc6cfa595805004
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 03:55:46 +0800
Tag:    v2.6.0-beta

Merge branch 'w29_MDL-40423_m26_localsubdir' of https://github.com/skodak/moodle

commit 88ad6d0a999df2cd0fcd8bbfc527e216e8a73ebe
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Jul 2013 21:29:03 +0800
Tag:    v2.6.0-beta

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

commit 5b0804c4b19200088e293e7817fa4583da21f4fb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Jul 2013 17:41:47 +0800
Tag:    v2.6.0-beta

Merge branch 'w29_MDL-40563_m26_themecaching' of https://github.com/skodak/moodle

commit 3f0a8871d3f819b8d314133a4ae23fa419fdcaa5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Jul 2013 15:57:34 +0800
Tag:    v2.6.0-beta

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

commit e780e5cb8ff91a2bd3651c8e89284bfd188b20a1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Jul 2013 07:29:01 +0800
Tag:    v2.6.0-beta

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

commit adbdb9b5c7d6b287231d9e3f224b53ac03a8357a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Jul 2013 06:26:44 +0800
Tag:    v2.6.0-beta

Merge branch 'w29_MDL-40571_m26_adminblocks' of https://github.com/skodak/moodle

commit 88e4c0848a04b9006ddfa620376182fa34793404
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Jul 2013 04:07:47 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40412' of git://github.com/merrill-oakland/moodle

commit 37aa0545a1e69dc532fa92b89cbd7f6c7104f99c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 15 Jul 2013 23:02:01 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-38747-master' of https://github.com/satrun77/moodle

commit 619658b877c67021df6d983d8947ae6caabfbe47
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Jul 2013 17:36:29 +0800
Tag:    v2.6.0-beta

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

commit 620e1e37872a92291ca43264df8bd28259bb453d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Jul 2013 17:34:55 +0800
Tag:    v2.6.0-beta

Merge branch 'w27_MDL-39088_m26_uninstall' of https://github.com/skodak/moodle

commit cfe8b6df3320ff3fc548a621c89f810ba89c5816
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Jul 2013 03:52:17 +0800
Tag:    v2.6.0-beta

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

commit 7b2ca655745fe57f20fca66be875a599ee08c6ff
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Jul 2013 03:22:30 +0800
Tag:    v2.6.0-beta

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

commit aefc66dd35203188c7aab154b5ee29a7ea44a437
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Jul 2013 03:11:49 +0800
Tag:    v2.6.0-beta

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

commit c946f60b0d6ef3848d9db2dbd5e17beb41864904
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Jul 2013 01:41:44 +0800
Tag:    v2.6.0-beta

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

commit 1203222a3c98c3da282c0da78c68bb85b1aed49a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 20:27:34 +0800
Tag:    v2.6.0-beta

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

commit 3c2e7a0e7cc87b581a051a0356019599d165d19e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 20:09:11 +0800
Tag:    v2.6.0-beta

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

commit 8b180f2317ec65716aa978b1b7864a63186ff057
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 19:47:09 +0800
Tag:    v2.6.0-beta

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

commit 9a6a2d1ce07f875932f5f2aadd5e537882fb17fb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 06:46:30 +0800
Tag:    v2.6.0-beta

Merge branch 'get_users_by_capability_fix_master' of http://github.com/timgus/moodle

commit c6638cd6ce6c4bebabd16d42544becaf212baa6b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 06:43:31 +0800
Tag:    v2.6.0-beta

Merge branch 'w27_MDL-39088_m26_uninstall' of https://github.com/skodak/moodle

commit dfd851be7c2181420dd28e3b2738ae5308f43060
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 05:13:39 +0800
Tag:    v2.6.0-beta

Merge branch 'w27_MDL-39754_m26_evn26' of https://github.com/skodak/moodle

commit e4bb5050a6ab481a6f858ead217fb9aa9300e807
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 01 Jul 2013 23:59:06 +0800
Tag:    v2.6.0-beta

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

commit 20e511a9acecf4e813f86fec4fe62d99c25ebf66
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 28 Jun 2013 02:04:35 +0800
Tag:    v2.6.0-beta

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

commit 26568ba86584f65245934154db76e63f4fbf0a8d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 26 Jun 2013 18:30:41 +0800
Tag:    v2.6.0-beta

Merge branch 'w26_MDL-39701_m26_filterupgrade' of git://github.com/skodak/moodle

commit 74618f31d276d6c8a60074f97369fa35edd95db8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 22:28:22 +0800
Tag:    v2.6.0-beta

Merge branch 'w26_MDL-17081_m26_roles2' of git://github.com/skodak/moodle

commit 09579cd1982d1babc16f8fdeeb96e22166c81db2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 18:08:15 +0800
Tag:    v2.6.0-beta

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

commit 7f5c46db8c44fb0b8a562c89cbc25c24b63e4612
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 07:42:17 +0800
Tag:    v2.6.0-beta

Merge branch 'w26_MDL-17081_m26_roles2' of git://github.com/skodak/moodle

commit 65ab140e00ed9770c21aa5c3023031e17e38429c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 03:29:05 +0800
Tag:    v2.6.0-beta

Merge branch 'w26_MDL-40233_m26_frontset' of git://github.com/skodak/moodle

commit 293aba00b7dc02e43980a46424e9331af12a3ab7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 03:24:00 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40264-essay-zero' of git://github.com/ktemkin/moodle

commit 1d04b481dd32ca400dcb0378af7500ab44e6fa0a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 03:13:01 +0800
Tag:    v2.6.0-beta

Merge branch 'w26_MDL-40254_m26_flatfile' of https://github.com/skodak/moodle

commit 283dd00b7ebc421375676e3f68a6cbd6ec5d6c3a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 02:21:22 +0800
Tag:    v2.6.0-beta

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

commit b662b8576d86d5c41d95cfcc7582d6de6a606731
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 01:25:53 +0800
Tag:    v2.6.0-beta

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

commit 75413055d0a62ad68e6eab762ef45f3be1cf2c41
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 01:00:33 +0800
Tag:    v2.6.0-beta

Merge branch 'm26_MDL-40200_Notices_When_Viewing_Profile_Invalid_UserId' of https://github.com/scara/moodle

commit e2eccd0952b00278c4fdae79ab49a9686e25015f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 00:56:08 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40258_master' of git://github.com/sam-moodle/moodle

commit 4cd8979c42bec2fd35881c6bdab30807711ba39a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 24 Jun 2013 23:23:29 +0800
Tag:    v2.6.0-beta

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

commit 3093713382abe6ba205e1434187c631489f317f9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 24 Jun 2013 21:39:07 +0800
Tag:    v2.6.0-beta

Merge branch 'w26_MDL-17081_m26_roles2' of git://github.com/skodak/moodle

commit 952cd137965248b5f74a7a1b98444fe54c450fa8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Jun 2013 16:37:45 +0800
Tag:    v2.6.0-beta

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

commit 421e6decf49e02baf00f1a7c08ee263756fd3fb3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Jun 2013 07:43:57 +0800
Tag:    v2.6.0-beta

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

commit 96c90fab6ad066029c9f91c6142a76ac618da611
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Jun 2013 07:30:07 +0800
Tag:    v2.6.0-beta

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

commit 57ed9d90c7d76da8256479b57cd66eb799d289d4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Jun 2013 06:55:53 +0800
Tag:    v2.6.0-beta

Merge branch 'w25_MDL-40210_m26_badgescaps' of git://github.com/skodak/moodle

commit a48dad1fe1259a39189707ab0ab46dd223ea3a4c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Jun 2013 06:40:36 +0800
Tag:    v2.6.0-beta

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

commit b21a6e26fa36c5521fcc3f5b0aa0eeca93090dfa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 06 Jun 2013 01:31:53 +0800
Tag:    v2.6.0-beta

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

commit 33a54457ca41efe96cca8b9e574bd1b0998e19a9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 22:22:58 +0800
Tag:    v2.6.0-beta

Merge branch 'w23_MDL-39588_m26_ociinstall' of git://github.com/skodak/moodle

commit cd8e9b19c5e4a59e67ad8e70111f22c69e1d83a1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 22:10:39 +0800
Tag:    v2.6.0-beta

Merge branch 'w23_MDL-39503_m26_signup' of git://github.com/skodak/moodle

commit 6c1c8b8ce0ea72b8e6f6982c62021bbf8c1d86b2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 16:36:16 +0800
Tag:    v2.6.0-beta

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

commit 371bf22cc6931c9acfff5e97db6ba6faafe556bb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 08:45:37 +0800
Tag:    v2.6.0-beta

Merge branch 'master-MDL-39409-auth-cas-use-moodle-web-proxy' of https://github.com/brki/moodle

commit 8c07c404be2127d952c79a9577ee27e65dadf22d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 08:43:21 +0800
Tag:    v2.6.0-beta

Merge branch 'w23_MDL-39416_m26_pagelog' of git://github.com/skodak/moodle

commit 796b57ea0bf1e059106e609d037f74bbc5127b08
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 08:32:29 +0800
Tag:    v2.6.0-beta

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

commit eb5bc31d2488d3999d24ddd2df1d5b6bb41366ed
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 08:29:43 +0800
Tag:    v2.6.0-beta

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

commit 28820155d1bc79c8cc591ad9af109270d254492a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 08:27:08 +0800
Tag:    v2.6.0-beta

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

commit 3294f68f4aa6ac278a8837644a17ea524fcd0f0e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 08:22:22 +0800
Tag:    v2.6.0-beta

Merge branch 'm25_MDL-38545_PHP_Strict_error' of https://github.com/scara/moodle

commit 32ce8b6803b1387bd40156c4040971632fc5a9e3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 07:43:03 +0800
Tag:    v2.6.0-beta

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

commit 79452da1c88e9df88af2f3213f65cf1036f9ee15
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 23:47:45 +0800
Tag:    v2.6.0-beta

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

commit b50ddbdbd5a72ae5f1354e72ed29cf4cc9463332
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 07:51:10 +0800
Tag:    v2.6.0-beta

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

commit 00169e862eeeb91f08f62b25beb5f1e59e0ce26a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 07:36:16 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-39764_master_3' of git://github.com/gjb2048/moodle

commit fd4c01566ee7a8ee5d8af74e91a33e9e0f0afa54
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 07:31:54 +0800
Tag:    v2.6.0-beta

Merge branch 'w23_MDL-39882_m26_behatconfig' of git://github.com/skodak/moodle

commit 422595e28243be739c78d43b4bd497575b024e4a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 07:14:09 +0800
Tag:    v2.6.0-beta

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

commit 5431fda1803b8f9e9e55c8a59faab11671d575d2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 06:04:12 +0800
Tag:    v2.6.0-beta

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

commit a346c3826bb6211e7f31cb668dea77ca47ae05af
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 05:59:12 +0800
Tag:    v2.6.0-beta

Merge branch 'w23_MDL-39465_m26_environment' of git://github.com/skodak/moodle

commit 0288c5ffe15217bf1758ef7e3c1c4ee1adcedfe1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 05:51:22 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39166-m25' of https://github.com/jfilip/moodle

commit 9e3b5a47f63b877fd0517d15956eb81ea4a90063
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 05:18:55 +0800
Tag:    v2.6.0-beta

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

commit 71b2d24a9bb9e5de6086e88e545bf00b3aee2471
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 01:10:00 +0800
Tag:    v2.6.0-beta

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

commit 6cffc6664704068b46817aa0349de30e5e576a31
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 01:03:15 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39487_master' of https://github.com/IOC/moodle

commit c557f6b3247d15c2a814bcb5c41069f7766f7d9f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 03 Jun 2013 22:20:41 +0800
Tag:    v2.6.0-beta

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

commit aeb5f9ae37b142894dec6dfb9db0ad240f2a52fe
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 May 2013 21:31:07 +0800
Tag:    v2.6.0-beta

Merge branch 'w22_MDL-39676_m26_whereparam' of git://github.com/skodak/moodle

commit 33b9fecd1942aacc9b727c77f24b56b51d488293
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 May 2013 07:23:27 +0800
Tag:    v2.6.0-beta

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

commit f50ca7b3df09a87e4c848ece0ee5b68f7871088b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 May 2013 07:00:57 +0800
Tag:    v2.6.0-beta

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

commit ed602a597d43871bf338dadcb1df22b82a7e5633
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 May 2013 06:56:37 +0800
Tag:    v2.6.0-beta

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

commit cc4cbf67f0a8f69f0ab7c63240fd91272cee7414
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 May 2013 06:02:58 +0800
Tag:    v2.6.0-beta

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

commit 89f6db3776cebd3d9a7a68d4d53032979b84c4ce
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 May 2013 21:50:56 +0800
Tag:    v2.6.0-beta

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

commit 65fc4c39a931e3c2f81f6f441c6871afadc8ba7c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 May 2013 08:22:55 +0800
Tag:    v2.6.0-beta

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

commit a42467817b6aee27399c9b7302cd86f0eda6fdec
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 May 2013 08:25:41 +0800
Tag:    v2.6.0-beta

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

commit 40cdce2e780bb90cdf9a5d0b4f08c5405944333e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 May 2013 07:46:45 +0800
Tag:    v2.6.0-beta

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

commit 388b7d7d98bdac12310fc6cbd4443a44d09154a4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 May 2013 06:59:42 +0800
Tag:    v2.6.0-beta

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

commit 34e8106f5fa0c4cb92957c01c3d25a433f3729c8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 May 2013 06:54:08 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-26120' of https://github.com/jacks92/moodle

commit 5e1a48df9748bb160f6033ed325a6d9cbdd2ce6f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 May 2013 06:44:05 +0800
Tag:    v2.6.0-beta

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

commit 98204580b3d93af744e3a93301ebd5ede484f4b1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 May 2013 01:05:14 +0800
Tag:    v2.6.0-beta

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