Git merges in Moodle 2.6.x by Sam Hemelryk

commit bfb99b7e1d3a657b93d8ee001c3e366ce20325b5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 05:16:39 +0800
Tag:    v2.6.2

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

commit 90e7406e296591c2637b4c3ef074779c8eb4c860
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 05:15:41 +0800
Tag:    v2.6.2

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

commit 2f31445ff899c0e4fdc50c7babf490b0acfb64e1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 04:16:41 +0800
Tag:    v2.6.2

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

commit 0b420fab17384e98ef05fb817be1fae53ae411ab
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 04:07:02 +0800
Tag:    v2.6.2

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

commit a413d15875271873a39769fde84732753f13fc86
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 04:04:51 +0800
Tag:    v2.6.2

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

commit ba0f2d978be295587280f4330cc1a740244ac6c1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 03:49:12 +0800
Tag:    v2.6.2

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

commit 3c60db1a842cb8d3623a6f90b0d00a6b1bdbb453
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 03:28:06 +0800
Tag:    v2.6.2

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

commit a70818530e091e068b4e569e43e1afc7c2e612da
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 13 Feb 2014 03:25:32 +0800
Tag:    v2.6.2

Merge branch 'int26_MDL-43200' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 7a27c83bc0fe03b4f41ab9666e271d2a15bc6812
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Feb 2014 04:24:11 +0800
Tag:    v2.6.2

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

commit 58ce5122b226e36a5a68e4f7ecc83e6bf269f8bb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Feb 2014 09:10:58 +0800
Tag:    v2.6.2

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

commit ec5dc1fab75f1d14bb7fbc766eed636d1b00f3c2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Feb 2014 03:27:44 +0800
Tag:    v2.6.2

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

commit 5eb9a4f631f352400e8bf21764b173c80dabf552
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 10:26:24 +0800
Tag:    v2.6.2

Merge branch 'wip_26_mdl-32724' of https://github.com/iarenaza/moodle into MOODLE_26_STABLE

commit e2b27417dc30967a5fc26645efb30f1e122cca41
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 10:20:25 +0800
Tag:    v2.6.2

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

commit 8ebaf4bd7401b2af6530ef6a57cd7429a6d89307
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 09:53:55 +0800
Tag:    v2.6.2

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

commit 7aaf82deb64b5ff479a857b9d5d00a1893923d0d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 09:16:22 +0800
Tag:    v2.6.2

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

commit 83fffcb97a3c666dbbcbc2e229b9fdd16b026afd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 09:11:36 +0800
Tag:    v2.6.2

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

commit a5a7dd624f77eb36ecff72fe3a9f92f77f691164
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 08:13:03 +0800
Tag:    v2.6.2

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

commit 4acc62f2c41186d93ee3e757bc09384d5ced68bd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 06:50:34 +0800
Tag:    v2.6.2

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

commit e32b3de09eb21ae2c4433ca26eaa074d702780f0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 06:30:20 +0800
Tag:    v2.6.2

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

commit 7082e945b226ea1d17c716b5644764838bca68f1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 06:27:12 +0800
Tag:    v2.6.2

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

commit ab4ec7a21c586c84f3afc41bf1ba5ad290fc5574
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:48:22 +0800
Tag:    v2.6.2

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

commit 4e4fabd197b5e351810a3a85db20642ddd9528f0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:40:21 +0800
Tag:    v2.6.2

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

commit 8ef741eeca663b23fd89ef12b842fd9166fe4ed3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:31:04 +0800
Tag:    v2.6.2

Merge branch 'MDL-44020-STABLE-26' of git://github.com/jleyva/moodle into MOODLE_26_STABLE

commit 764d330c3efc75594ed7bb94d669941a8dffebb4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:28:19 +0800
Tag:    v2.6.2

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

commit a95a35632279fb84898e3a78b9156a6ba8caaefb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:24:01 +0800
Tag:    v2.6.2

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

commit dfc8d1d7f5e5a1b225bf63b4130cd7e50b9ae6c6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:06:40 +0800
Tag:    v2.6.2

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

commit fdf33244b503504f8284be622593ae775c8dc7ac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 03:44:56 +0800
Tag:    v2.6.2

Merge branch 'MDL-44029-quiz-group-delete-handler-bug_26_STABLE' of https://github.com/mpetrowi/moodle into MOODLE_26_STABLE

commit 3b6aa4f70cee3738e47be205a21e1feca1c8661d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 03:43:05 +0800
Tag:    v2.6.2

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

commit 155771cb4bcca6235e465733a4ce5ac54268aa06
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 06 Feb 2014 05:04:06 +0800
Tag:    v2.6.2

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

commit 82bef99867baba932526073c2ac250dea2d5ad63
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 10:24:02 +0800
Tag:    v2.6.2

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

commit 93289de65eaf602c1bb4217ca1870248f2b05be0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 07:38:28 +0800
Tag:    v2.6.2

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

commit 5dce0f2a1aaefca6ff68f15637591af9eab694bd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 05:57:37 +0800
Tag:    v2.6.2

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

commit 90c15466d8467c7309cc609b554539c7d7366c42
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 05:47:09 +0800
Tag:    v2.6.2

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

commit c78f073a411ca1018585dd828ef334e7cb24413a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 05:11:47 +0800
Tag:    v2.6.2

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

commit 2ad02f9c91a62947026968d31b9f7f45bd526a48
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 04:11:41 +0800
Tag:    v2.6.2

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

commit fa0b936d59628a34927ddb3dd856cbd05d825b00
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 03:29:17 +0800
Tag:    v2.6.2

Merge branch 'wip-MDL-39942-MOODLE_26_STABLE' of https://github.com/kwiliarty/moodle into MOODLE_26_STABLE

commit 9681639337c3cd9aaeacacffa9f0d744f40f3967
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 28 Jan 2014 07:16:26 +0800
Tag:    v2.6.2

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

commit 83bfad45a54349509698ea2df67de39820bfa432
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 28 Jan 2014 03:40:48 +0800
Tag:    v2.6.2

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

commit 250611b579f46769324ff8c9af9f045d2e255d4a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 27 Jan 2014 06:32:25 +0800
Tag:    v2.6.2

Merge branch 'w04_MDL-43746_m26_courselogin' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 5ccfa402920f5a9c95d32f943c6dd8ccf216f5fe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 27 Jan 2014 06:16:15 +0800
Tag:    v2.6.2

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

commit 0cb1903bfd7027e5ce5b62a95aa8c2baf54bcb0a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 06:28:25 +0800
Tag:    v2.6.1

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

commit 8571b889f37c13a77cdc4cbd68797c2cc18012ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 06:22:09 +0800
Tag:    v2.6.1

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

commit ec9f2a7d3f10bd9582d860ff13fcc871199443a6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 05:30:13 +0800
Tag:    v2.6.1

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

commit 97e9098927830a68b75aa3964f1b242c5c09d2c3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 05:20:39 +0800
Tag:    v2.6.1

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

commit 910dc3393cf3cd05c98182bb9a5aa0c0d66d977d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 12:17:46 +0800
Tag:    v2.6.1

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

commit 5ac473e356d45d64053edc4c7853d606b7227216
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 07:52:02 +0800
Tag:    v2.6.1

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

commit 10beedc18fac2e58f90b5786d37eb3bf94fc5160
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 06:41:32 +0800
Tag:    v2.6.1

Merge branch 'MDL-41246-moodle26' of git://github.com/StudiUM/moodle into MOODLE_26_STABLE

commit 83797afa91f6baaf6403ba5e01def69dcfff6d36
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 06:23:06 +0800
Tag:    v2.6.1

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

commit d3220e229efa591bf25d6374bc5c40a838b8dc70
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 05:44:04 +0800
Tag:    v2.6.1

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

commit f2b1768da677d0d3dccef8add3d196246a69c978
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 04:12:47 +0800
Tag:    v2.6.1

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

commit 1c5052e29fdb5b22ebf1f056327ce91104b5127f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 10:57:49 +0800
Tag:    v2.6.1

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

commit 61dde025a16de04aed8703f8d267ba1e7dd529e7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 09:35:07 +0800
Tag:    v2.6.1

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

commit b10fec175071ebe99c34822e0103187d3eaee278
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 09:31:50 +0800
Tag:    v2.6.1

Merge branch 'w52_MDL-43367_m26_contextpath' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 2347fe54507776a201741ae541d48b4acdb21556
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 03:50:48 +0800
Tag:    v2.6.1

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

commit 43d6e05c24d85c30d17c4392498de32e81e71b2f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 03:16:23 +0800
Tag:    v2.6.1

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

commit 12c847fed95be78ad0e1f624542b1e04cb2e6774
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 06:19:26 +0800
Tag:    v2.6.1

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

commit 6a8e8ac25ede25224f0b0bcb2dc77f43fee2433c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 05:45:02 +0800
Tag:    v2.6.1

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

commit f01cac675a1bdee1c7d65011c8024ce16b3a6c3f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 04:58:51 +0800
Tag:    v2.6.1

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

commit 3aa576a8ef7087e203cf5ecc15ab6cf1d42f69f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 04:21:31 +0800
Tag:    v2.6.1

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

commit 21bb4f142c84866054e8fa35f8f971d7df363678
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:54:22 +0800
Tag:    v2.6.1

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

commit 7809633d79c37a6c3a81242c69dda5adaa7038a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:47:51 +0800
Tag:    v2.6.1

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

commit 7f574aadffc47a4d8f7f404d67ba08816cfce8f3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:44:52 +0800
Tag:    v2.6.1

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

commit 9c099d21eb9952025b28cd414f458e795405a2a7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:24:52 +0800
Tag:    v2.6.1

Merge branch 'w51_MDL-43268_m26_filternotice' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit a3a8490d3a8779b62a29fb7ed324d09aa359b9f9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 10:43:47 +0800
Tag:    v2.6.1

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

commit e9623e55e31a30eb888b734a768f92811fa0aabc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 10:40:25 +0800
Tag:    v2.6.1

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

commit e646b89f8b83a41eda7e413f744a8e6cf64857b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 09:09:52 +0800
Tag:    v2.6.1

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

commit a0f5d96f1e44b1cffe8081632c36b6d0575968a7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 08:52:03 +0800
Tag:    v2.6.1

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

commit 45c058331283a707f965648923b28bc8ad23aa2a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 06:31:13 +0800
Tag:    v2.6.1

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

commit 05a423d850b2c47eb3319592da483a4f31e39e02
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 06:17:46 +0800
Tag:    v2.6.1

Merge branch 'w51_MDL-42931_m26_env27' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 12869bfdb12649b0793a27d19e699366cf6e1148
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 06:11:26 +0800
Tag:    v2.6.1

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

commit 909f01f17ec13117216604d0e62ff3dcc211e204
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 04:46:32 +0800
Tag:    v2.6.1

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

commit 40d3bc442fba7a6af145a457dc54dad3818dc576
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 13 Dec 2013 11:59:31 +0800
Tag:    v2.6.1

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

commit 5fbc32ebdbdad279c6731b6f9b8c1bc1aea53124
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 06:12:55 +0800
Tag:    v2.6.1

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

commit 9f00dabf864562889491014344d8b1f000a21c22
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 06:03:23 +0800
Tag:    v2.6.1

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

commit 51d311f703f2c9fd146d7b25dd2dc7306102ff89
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 05:58:49 +0800
Tag:    v2.6.1

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

commit 3ef86b39098ea54f8d869a7493ec6ccb746b0c98
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 05:51:21 +0800
Tag:    v2.6.1

Merge branch 'w50_MDL-31625_m26_replace' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit bdb2677b79250de4f8f14cd891cc5b6905bb245d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 05:34:04 +0800
Tag:    v2.6.1

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

commit e5bb9741b646b2fece10177c19dc75e1a9557a12
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 04:50:27 +0800
Tag:    v2.6.1

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

commit c7f545bbb0dd713e063df5738c8e497ea563a8c9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 04:20:33 +0800
Tag:    v2.6.1

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

commit b2a803d5d1620641c16b35ceb81b4df194ae4917
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 03:48:04 +0800
Tag:    v2.6.1

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

commit 8eb717f9936970bfbc55e4895cc0d7541056b16f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 03:43:36 +0800
Tag:    v2.6.1

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

commit 8e60097af88ff17a5f4e739882889c6d48202c59
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Dec 2013 06:52:18 +0800
Tag:    v2.6.1

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

commit f5a134213d18812576a75109b565a5a21a94344c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Dec 2013 04:43:24 +0800
Tag:    v2.6.1

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

commit 7ac957682535fdf3d40ec719ad67e0ebed9c18c0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Dec 2013 04:42:34 +0800
Tag:    v2.6.1

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

commit 1cb0536bcb106f0686fecdd1cded0a3331e1c545
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Dec 2013 04:58:10 +0800
Tag:    v2.6.1

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

commit f098ca6d97808ceabfff929218a2bcc19f9e1ca0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Dec 2013 08:39:51 +0800
Tag:    v2.6.1

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

commit 390896d3d95671a670a58172aafdfdcf8f038509
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 26 Nov 2013 03:36:09 +0800
Tag:    v2.6.1

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

commit a34073eeb886694dc207e51b219ab1f475a0849e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 07:24:41 +0800
Tag:    v2.6.1

Merge branch 'w47_MDL-42612_m26_paypalruble' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 64b4fbebd85a3155c234abd046efe65e9e5925aa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 05:09:18 +0800
Tag:    v2.6.1

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

commit c31fc5a099055bddddf01710d56555f9816ee307
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 12 Nov 2013 16:30:39 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42812-r1' of git://github.com/abgreeve/moodle

commit b8a598ad6591ded8c436430e5a5d43fb75969f72
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 12 Nov 2013 13:53:08 +0800
Tag:    v2.6.0-rc1

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

commit 0ac5863d862e5b00d65ee22ec95c0f9de9e1218b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 12 Nov 2013 13:20:12 +0800
Tag:    v2.6.0-rc1

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

commit 6f4a169d8e50cb77561caa8e9d9e3351931c7549
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 12 Nov 2013 11:34:39 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42215_lang' of https://github.com/andyjdavis/moodle

commit 68bcc3faaf722d3da4fb83892cd61d959e468fe9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Nov 2013 14:10:21 +0800
Tag:    v2.6.0-rc1

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

commit 0fd6069ecd81eee278e54bebc3d32e1e191653a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Nov 2013 13:10:44 +0800
Tag:    v2.6.0-rc1

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

commit 16a14e4a5f2b19f725dbfdc9d0da81033526bae1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 07 Nov 2013 11:29:57 +0800
Tag:    v2.6.0-rc1

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

commit 8e23283cbbbfa761299cbafecb8e681bea0b21d5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Nov 2013 14:24:46 +0800
Tag:    v2.6.0-rc1

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

commit acdb2159fb59ade51e21c23b2046b7249719597a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Nov 2013 14:00:30 +0800
Tag:    v2.6.0-rc1

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

commit 9620bcebee54514f267607871cd6570fe0138504
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Oct 2013 16:00:30 +0800
Tag:    v2.6.0-rc1

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

commit ab4fdbdf42416be9ad9be3f9cff0cd3c2d2296fe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Oct 2013 14:15:44 +0800
Tag:    v2.6.0-rc1

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

commit 2e29034313f5d43287553d7e7c00a6141a7a5cf3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Oct 2013 13:44:56 +0800
Tag:    v2.6.0-rc1

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

commit df2d3777ccbf02329d605619b91ca6025bbc1706
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Oct 2013 08:40:08 +0800
Tag:    v2.6.0-rc1

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

commit 28fef14840ed48687e07986a32ab972e430a279b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 Oct 2013 11:06:40 +0800
Tag:    v2.6.0-beta

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

commit c80ef689d5c07a1d926bab4411cc1f491978734e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 Oct 2013 09:40:02 +0800
Tag:    v2.6.0-beta

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

commit 2dc15b1011f26a161a9d0a3c3451e6668993f4ce
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 Oct 2013 03:37:03 +0800
Tag:    v2.6.0-beta

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

commit 2219f50a103eac8d44c5cda7b66f650e953ab28e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 Oct 2013 03:34:11 +0800
Tag:    v2.6.0-beta

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

commit d00b3f19b9e8cf726b49cc4e9df9cbb1c0974d11
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Oct 2013 11:25:22 +0800
Tag:    v2.6.0-beta

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

commit f18f96f767af3ca4cbd6e12e6cb0ec6e990217eb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Oct 2013 10:57:30 +0800
Tag:    v2.6.0-beta

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

commit 571781fbf6337468aa1ce83cbf4da5af8af6b5f2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Oct 2013 07:41:36 +0800
Tag:    v2.6.0-beta

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

commit 08f95ac5e5b6f52466a5bc950a7b58d1ae3d4ae6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Oct 2013 04:23:53 +0800
Tag:    v2.6.0-beta

Merge branch 'w41_MDL-16073_m26_extdbtest_i' of https://github.com/skodak/moodle

commit 9d1b909a9c8ae247f58bda982bba6f5c50370cff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Oct 2013 03:54:46 +0800
Tag:    v2.6.0-beta

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

commit ff8e2578676dd39c7d38624e35493f573bcdd8ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Oct 2013 11:04:05 +0800
Tag:    v2.6.0-beta

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

commit cbf34f34cccbe5200b580d0fc853124c981b52a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Oct 2013 09:43:36 +0800
Tag:    v2.6.0-beta

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

commit 87f28ddceb41330d6b3850a06d1b13f4e114c62e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Oct 2013 06:20:51 +0800
Tag:    v2.6.0-beta

Merge branch 'w41_MDL-42078_m26_uninstallcleanup' of https://github.com/skodak/moodle

commit 8050eec577a7341935e47385e938d5a63658cbec
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Oct 2013 03:52:42 +0800
Tag:    v2.6.0-beta

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

commit 6455dec02db8c0b45a762ed7905a26abb2cc6f3e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Oct 2013 03:48:43 +0800
Tag:    v2.6.0-beta

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

commit 81a939be02a787094f04c3c04babe1bcdd2b9b09
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Oct 2013 03:27:46 +0800
Tag:    v2.6.0-beta

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

commit 4d00df46b19132fa0abae690a4f5ff3bd7569e53
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Oct 2013 12:38:25 +0800
Tag:    v2.6.0-beta

Merge branch 'w41_MDL-42040_m26_shutdown' of https://github.com/skodak/moodle

commit 8618757c66b1e206b9d87a9b169ff35522961469
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Oct 2013 10:51:45 +0800
Tag:    v2.6.0-beta

Merge branch 'w41_MDL-41220_m26_pluginlist' of https://github.com/skodak/moodle

commit 6ac0b011759e3b1f3eccd85386325c83e715900e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Oct 2013 10:40:48 +0800
Tag:    v2.6.0-beta

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

commit 4c9da232d05f324d4f077aace13393b2da7b2c27
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Oct 2013 08:43:08 +0800
Tag:    v2.6.0-beta

Merge branch 'w41_MDL-41197_m26_convnotices' of https://github.com/skodak/moodle

commit d6cb394f2c749b3ed2f961550885f556f1ecef94
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Oct 2013 07:50:29 +0800
Tag:    v2.6.0-beta

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

commit 577fc805a200a826490dca96d9aaf38e34235474
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 04 Oct 2013 10:43:52 +0800
Tag:    v2.6.0-beta

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

commit 7f62e4040aeeadc90ecdf345d8442d839c9cddcb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 04 Oct 2013 03:25:58 +0800
Tag:    v2.6.0-beta

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

commit 322ca2fc66d95320f975bbf3209a6f6dc2c14948
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 03 Oct 2013 11:03:22 +0800
Tag:    v2.6.0-beta

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

commit c7387be83b99971576d487f2244309e6443b2aa4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 03 Oct 2013 03:34:39 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-16464' of https://github.com/timhunt/moodle

commit 18f04ab62520eb1dfa7743fd312361ee9772393e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Oct 2013 07:10:08 +0800
Tag:    v2.6.0-beta

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

commit 6579a7b7910e88f45df71da618b172ad36f1ba51
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Oct 2013 06:36:16 +0800
Tag:    v2.6.0-beta

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

commit 55fcb3504f6203fa5fd214982be80636b16aa760
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Oct 2013 05:52:03 +0800
Tag:    v2.6.0-beta

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

commit 49b38d141e0db01cc189dfabffcf05fceb5f9dd0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Oct 2013 05:36:56 +0800
Tag:    v2.6.0-beta

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

commit 28a6f665f4ef5e7caf7147b573018331bf8e2e23
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Oct 2013 05:27:54 +0800
Tag:    v2.6.0-beta

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

commit 7f58018843213a81626e5b439da6b08dea4b1ccc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Oct 2013 03:14:36 +0800
Tag:    v2.6.0-beta

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

commit c78fdd8db3f4d6efc775603c38d4324d1f1753b4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 09:50:53 +0800
Tag:    v2.6.0-beta

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

commit 421dd2e8ebe8eeea0aea430d8c8a06c1af34b346
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 09:35:49 +0800
Tag:    v2.6.0-beta

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

commit 9b2fdfab44479dd05e8119abc60fb1bc0a933d50
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 09:06:28 +0800
Tag:    v2.6.0-beta

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

commit 5101954f03e63ca6fc32856b3a16e3fd9d9f5da5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 08:58:17 +0800
Tag:    v2.6.0-beta

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

commit a0a63fa52625ffd99e6c98374bb7af0ada768bd0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 08:45:18 +0800
Tag:    v2.6.0-beta

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

commit 52dc898d167b6f2ed196b798c33d8bc0b4ff2d80
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 08:37:44 +0800
Tag:    v2.6.0-beta

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

commit 53be2d782a038f085508d6c54d6a1278553d7883
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 07:07:22 +0800
Tag:    v2.6.0-beta

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

commit 5e319f510105796b9930437e8d78a502ec410cc2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 06:18:14 +0800
Tag:    v2.6.0-beta

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

commit 7da590c11b0e84b62b740ad763a72e2cb890e779
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 06:05:59 +0800
Tag:    v2.6.0-beta

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

commit 7bd5d84fd89132d306aa96ea5106b348bc6dba5b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 05:17:13 +0800
Tag:    v2.6.0-beta

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

commit bd5797e6cce3ac6b0406c046910b64d9c777c1ce
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 05:14:04 +0800
Tag:    v2.6.0-beta

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

commit c3923927255cdd37a4dfef2edf809d307f7e3b67
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 04:54:26 +0800
Tag:    v2.6.0-beta

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

commit d55c29562bca937e66109a9795d4ffc7a533d875
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Sep 2013 11:34:51 +0800
Tag:    v2.6.0-beta

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

commit 73cc3bdeb0ea4146201506651f22f3d331dcf833
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Sep 2013 11:15:53 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41227_dd' of https://github.com/andyjdavis/moodle

commit 4754755625e0c5e116cf9230a880ed9061f13ed7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Sep 2013 10:42:03 +0800
Tag:    v2.6.0-beta

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

commit 00a28794128f0f312251718d287ceb6105a7db78
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Sep 2013 07:09:50 +0800
Tag:    v2.6.0-beta

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

commit 28a2ecc6c469a8bceaff38951da978d5f0b05087
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Sep 2013 06:55:19 +0800
Tag:    v2.6.0-beta

Merge branch 'w40_MDL-41176_m26_useredit' of https://github.com/skodak/moodle

commit e2c4c4202ddaf8938f00dc646d7e1e7d1da41625
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Sep 2013 05:48:36 +0800
Tag:    v2.6.0-beta

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

commit 2f0a996b101b8d0e0cab1acbbd31e90f02abbfb5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Sep 2013 05:38:11 +0800
Tag:    v2.6.0-beta

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

commit 322d9c8cdafccbd5143ff6ac0abc3664d2e3815f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 27 Sep 2013 07:32:05 +0800
Tag:    v2.6.0-beta

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

commit bc29e8f07a3fa38c44134b81ba74c2a86cc41af3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 26 Sep 2013 06:13:01 +0800
Tag:    v2.6.0-beta

Merge branch 'master_MDL-39910' of https://github.com/mayankgupta/moodle

commit e50df55c919aac76b503704687ac50bc79eeed7c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Sep 2013 12:27:09 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40848_master' of git://github.com/totara/openbadges

commit 6eef32525ecaad13daf157b5c48785cbc2060dd1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Sep 2013 06:18:30 +0800
Tag:    v2.6.0-beta

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

commit 35ed37be8f41977e5d3f5131c7a62f00098d6c15
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Sep 2013 06:02:57 +0800
Tag:    v2.6.0-beta

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

commit 548fbd8e1c906b48019fd97a472cc76aeb2c5c64
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Sep 2013 05:59:31 +0800
Tag:    v2.6.0-beta

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

commit 4b005d875156eef8f783a0dddbd177f44e739407
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Sep 2013 05:49:29 +0800
Tag:    v2.6.0-beta

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

commit 1f6181e5aa656223d9aee94594cfc9db32389a23
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Sep 2013 05:31:43 +0800
Tag:    v2.6.0-beta

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

commit a78e39e3d31b7acd9b54cb4bd39d6bd356424320
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Sep 2013 05:27:44 +0800
Tag:    v2.6.0-beta

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

commit 40643dcaad96e4c73b57c8c995ca87d208361c5e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 17:16:29 +0800
Tag:    v2.6.0-beta

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

commit 1f4f0901d0fc3a6569b4f4768b936ba3aa3dbd10
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 08:14:16 +0800
Tag:    v2.6.0-beta

Merge branch 'w39_MDL-41904_m26_markdown' of https://github.com/skodak/moodle

commit fb45f406a196f5e8fdf65d607300b60ffc940c16
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 08:09:47 +0800
Tag:    v2.6.0-beta

Merge branch 'w39_MDL-41903_m26_typo3' of https://github.com/skodak/moodle

commit 0eee7f9b43e08c27ed5934854cdc935648328978
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 08:01:03 +0800
Tag:    v2.6.0-beta

Merge branch 'w39_MDL-40107_m26_tcpdf' of https://github.com/skodak/moodle

commit 0fd451b7adcf8a7db9dc74af9699e1d1499afa92
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 06:02:58 +0800
Tag:    v2.6.0-beta

Merge branch 'WIP-MDL-39871_master' of git://github.com/nadavkav/moodle

commit 96218d0edbdbe7c3b6578ac8a8d72afdaeb037a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 05:37:10 +0800
Tag:    v2.6.0-beta

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

commit b3af3bbb963bcf7e6e526251918022dd82f58826
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 05:14:37 +0800
Tag:    v2.6.0-beta

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

commit 339feb64205c212f1e4084b0b39ce9952cf5cc01
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 05:04:27 +0800
Tag:    v2.6.0-beta

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

commit c99fcebdedcd45925a500ac3291fc2b9728890ea
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 04:51:41 +0800
Tag:    v2.6.0-beta

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

commit cc6a0ec48f68ccd1c7f7e05c56a773a32bc00a68
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 04:33:10 +0800
Tag:    v2.6.0-beta

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

commit 83c875a9a05f7057aab29755be3cc2905ce726d4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 04:28:40 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41591_zindex' of https://github.com/andyjdavis/moodle

commit d99847a338a6813ed08ad14ecaa2cb95c4c858af
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Sep 2013 11:02:49 +0800
Tag:    v2.6.0-beta

Merge branch 'w39_MDL-31501_m26_sessionreboot' of https://github.com/skodak/moodle

commit 2e79f57db9cb0d641789762c611a826e956574dc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 20 Sep 2013 10:34:25 +0800
Tag:    v2.6.0-beta

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

commit 669755a423b73f6db285114332271207af05ce6b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 19 Sep 2013 05:49:31 +0800
Tag:    v2.6.0-beta

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

commit d4d97627d2ffce96e86abc06e2d11d48dd07232d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 11:26:06 +0800
Tag:    v2.6.0-beta

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

commit 26c9c586c9a33520e136d4c09da9011ccad7f6ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 10:30:16 +0800
Tag:    v2.6.0-beta

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

commit 23eed08e1a3e82732246b1d5aab50c97ec7fc24b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 10:02:47 +0800
Tag:    v2.6.0-beta

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

commit 81ece3f7aac155247ee99826160036240a35e94b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 10:00:15 +0800
Tag:    v2.6.0-beta

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

commit c8f052dbdd14964d107103b588201f33bb5d6b29
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 07:44:39 +0800
Tag:    v2.6.0-beta

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

commit 77365f7ff68f292860459184d1aebcbd6987e8d8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 05:02:32 +0800
Tag:    v2.6.0-beta

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

commit f34af1167acb6696d188fb64a8b65336fd36a789
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 04:59:08 +0800
Tag:    v2.6.0-beta

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

commit 82b2bb5eca5bceb8e351265e5673fe774a80a1f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 04:50:38 +0800
Tag:    v2.6.0-beta

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

commit c2e7f9042761c65dd5a4e59b83e8fcb311eba0ea
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 04:48:59 +0800
Tag:    v2.6.0-beta

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

commit 0dd46bb851f510ee32b45b1946fe5055711bfa17
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 04:39:14 +0800
Tag:    v2.6.0-beta

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

commit 31dea4fea43a4cb7c752c70c0372738614a69630
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 11:07:57 +0800
Tag:    v2.6.0-beta

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

commit da8cd86f173a7487b1e8d5f89cd48d3b799f34f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 09:56:05 +0800
Tag:    v2.6.0-beta

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

commit efc2c5171280df1f463f40193d90bf18001d7927
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 09:51:12 +0800
Tag:    v2.6.0-beta

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

commit db220c29723fc509c22f2abf15450087dc44b307
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 09:48:48 +0800
Tag:    v2.6.0-beta

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

commit a93db2885006f5468fc43b7e87f561db5ad76664
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 09:46:07 +0800
Tag:    v2.6.0-beta

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

commit cf13da65e1c868eb8d1f65728fe5cde93db56958
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 09:13:41 +0800
Tag:    v2.6.0-beta

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

commit 0d5c80e2980715295f098765b16a4d0ae294c19e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 06:48:20 +0800
Tag:    v2.6.0-beta

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

commit 9034f94d0748b00082ac33b870f3f73e5fc16f3f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 06:42:47 +0800
Tag:    v2.6.0-beta

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

commit df1d3e911527eb797c61e5ad3a34d7c629e600fc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 06:27:16 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-27684-master' of git://github.com/satrun77/moodle

commit 7c76607aaa21c5e5e7d8394b77162d2f2eec35c5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 06:13:17 +0800
Tag:    v2.6.0-beta

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

commit 6b909c759d72a815167493d3fcf6ff1971b092e1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 06:50:08 +0800
Tag:    v2.6.0-beta

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

commit 214816fb191055681005a03b7a4a259d32fceebc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 06:13:29 +0800
Tag:    v2.6.0-beta

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

commit b3602b3e5e4e85e7fd77d45810ef0ea4752252f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:47:41 +0800
Tag:    v2.6.0-beta

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

commit 2ecaec9bb6e37c463cc36fdf452dde41dee3d70c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:42:40 +0800
Tag:    v2.6.0-beta

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

commit bf6181d451daab9a13ab620c9fa15be1c1d63582
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:39:13 +0800
Tag:    v2.6.0-beta

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

commit 67c52739d3dd10b2ec0ed8d22a2a2f1da2e34a0f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:32:33 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41634-url-download-warning' of https://github.com/mnoorenberghe/moodle

commit 087bc6ba67d1266631f58ab9be36df3d007459fe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:28:42 +0800
Tag:    v2.6.0-beta

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

commit ba5d7f8b1cb522fdec316397204b346295fc86fd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:26:44 +0800
Tag:    v2.6.0-beta

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

commit f773cb2e9424bb5366e139e1404c8db99c8de62f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:20:53 +0800
Tag:    v2.6.0-beta

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

commit cde5c4a58eb0016eb885f8886e3805c959ab9b38
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:12:32 +0800
Tag:    v2.6.0-beta

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

commit 3623d74adc61ef6b0eb3f584f66ed35131fa44d5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:00:54 +0800
Tag:    v2.6.0-beta

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

commit 994009ddfecff888ffb6c1719348278e72e62859
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 04:54:26 +0800
Tag:    v2.6.0-beta

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

commit 33636b404001815735716b3b0ff41992e70d0969
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 04:52:52 +0800
Tag:    v2.6.0-beta

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

commit f605403fe22915558e54add6c8ce3b442bd0f865
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 04:51:02 +0800
Tag:    v2.6.0-beta

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

commit 79257da228e7fd77af29065a061a3b6a12689f93
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 04:45:22 +0800
Tag:    v2.6.0-beta

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

commit c4f5f0ee597758530d58e00e3a65fc4973f7aca0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 04:42:37 +0800
Tag:    v2.6.0-beta

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

commit e0a8b60f5dc706afc42c23f239b38c3a451eafbf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 04:36:54 +0800
Tag:    v2.6.0-beta

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

commit c02045ddc4b8cd0ae3af6a7800971f84b64963c2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 04:34:58 +0800
Tag:    v2.6.0-beta

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

commit c0382dd012d7c080a19a66c17b6e89182f8db8e8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 11:44:49 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40735_lesson' of https://github.com/andyjdavis/moodle

commit cb7ca00c55ee5be44063a0db5cdc45cd3607fcb9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 09:12:13 +0800
Tag:    v2.6.0-beta

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

commit a63d1e2871541ce14c640d6bc3b03e205095c0d3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 09:07:37 +0800
Tag:    v2.6.0-beta

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

commit a775f2c96dbb00bdb2e3fa2625fcb348f9b64bb1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 07:22:04 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40731_headings' of https://github.com/andyjdavis/moodle

commit bee0a508ef4d1ac41bcdc3d7cf0564244c8ae82e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 07:16:30 +0800
Tag:    v2.6.0-beta

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

commit 68d3e7682ad51765b8918e4b0eb96f3a83eb5d43
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 06:31:59 +0800
Tag:    v2.6.0-beta

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

commit 12d50d8216f7b7797d5d49e1576b0c989acd715f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 05:38:46 +0800
Tag:    v2.6.0-beta

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

commit 9b6415dd38a6e6e4f74aa280cdcaea2be46b29f1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 05:36:24 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-29378-survey' of git://github.com/mudrd8mz/moodle

commit 33909ed001aa1891b7dd6046eda5beb4cfd75414
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Sep 2013 07:12:56 +0800
Tag:    v2.6.0-beta

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

commit 771080ba7d113039be0b83af3adeb2d069db070f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Sep 2013 06:54:11 +0800
Tag:    v2.6.0-beta

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

commit fb76f7492e59d02e1447c9c1698f46e88830165d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Sep 2013 06:48:13 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-29378-survey' of git://github.com/mudrd8mz/moodle

commit 58cc269d0c55c5cb6a80b60cd527986d735a094a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Sep 2013 06:19:00 +0800
Tag:    v2.6.0-beta

Merge branch 'w37_MDL-28094_m26_subdirs' of https://github.com/skodak/moodle

commit 0b7a2b7bec7fe778fc5d7895220c5ebc4102dbca
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Sep 2013 04:58:44 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41460-master' of https://github.com/FMCorz/moodle

commit c1613ed53ad966510884d51043f2dee138d6e682
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 09:17:37 +0800
Tag:    v2.6.0-beta

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

commit 2968602ccbf1eddb54107ee8152ea432d82912d7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 08:13:34 +0800
Tag:    v2.6.0-beta

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

commit 6eee89bc8f73ef59ba7b837fbdc3ebb2c51436f6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 08:08:46 +0800
Tag:    v2.6.0-beta

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

commit 1ef7722cba32b19c903edbb45dc33aa6f1875c6e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 07:01:51 +0800
Tag:    v2.6.0-beta

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

commit b89fbc461555d1d7ec58249681e6280eac7baa72
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 06:56:00 +0800
Tag:    v2.6.0-beta

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

commit ead9cce340cb90536b21f5e0388c67400ea602f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 06:48:02 +0800
Tag:    v2.6.0-beta

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

commit cc76e82d5862224e9f2b8fbb42b889a5292e470e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 06:21:04 +0800
Tag:    v2.6.0-beta

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

commit 0eb65affd29ed17e05a2c5554893f420c5b97d4b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 06:09:08 +0800
Tag:    v2.6.0-beta

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

commit c5bba2fc2df9b485e5b4e98fa97498700c9f59e6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 05:59:19 +0800
Tag:    v2.6.0-beta

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

commit 93564564e471a658e3da1486a2fa78cad029595b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 05:56:16 +0800
Tag:    v2.6.0-beta

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

commit d333a3f2da666042e7dd8eeca41145e5e915cc1b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 15 Aug 2013 11:16:19 +0800
Tag:    v2.6.0-beta

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

commit 0b7e4a1474f30651f88f4623e52c6d551077c3ac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Aug 2013 05:15:00 +0800
Tag:    v2.6.0-beta

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

commit 969de2a200e7c162508209b097f78b46fbe5789c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 10:13:13 +0800
Tag:    v2.6.0-beta

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

commit c0dfd035c4b0f6c563a55b5fcc0b4f49fd67712b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 06:49:12 +0800
Tag:    v2.6.0-beta

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

commit 0c0efd71a1bc2c889a039468dd42cbd637dc7cb6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 06:26:26 +0800
Tag:    v2.6.0-beta

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

commit 615cf2d15a287c79ba5ff5b868de4d37b4a1f8a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 06:19:34 +0800
Tag:    v2.6.0-beta

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

commit 49c7794dcf9866d543c2b6bc09d9cf28e26e53a6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 06:16:14 +0800
Tag:    v2.6.0-beta

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

commit 717d68544d4291d40a8de807d346d284f334974d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:46:17 +0800
Tag:    v2.6.0-beta

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

commit acf6a06d5ed1c7e375b35356b077b85f8028badd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:45:03 +0800
Tag:    v2.6.0-beta

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

commit 0ade13532ba91fcebd187c460221a82d70af00e2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:41:27 +0800
Tag:    v2.6.0-beta

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

commit defb89c30c8f25e26a39ea7789aaf01cf8f7b562
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:38:40 +0800
Tag:    v2.6.0-beta

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

commit 90fb4f39fd530e997488152449483834dbae2225
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:37:02 +0800
Tag:    v2.6.0-beta

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

commit 6648f17384969436349d78d7ae291c0072568e20
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:32:48 +0800
Tag:    v2.6.0-beta

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

commit bbf434b6396a1dcff1181725a5945c52e8061a5e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:27:50 +0800
Tag:    v2.6.0-beta

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

commit 23b7f1dfcfb29ac85c4bf6249cd3dbe43ca3384b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:24:12 +0800
Tag:    v2.6.0-beta

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

commit 61f2c458d59080bbac44671f59f6daf0244a1b25
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:12:24 +0800
Tag:    v2.6.0-beta

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

commit 41b0597855de58bfa4932469b7d520beb0d2e60f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:10:28 +0800
Tag:    v2.6.0-beta

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

commit 761b48df5912e479151ad3530bb4dace822d1daa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:08:15 +0800
Tag:    v2.6.0-beta

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

commit cd0103fa6043983ee9084a223903411e15615224
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:03:45 +0800
Tag:    v2.6.0-beta

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

commit f37d53296df4b5f7dd764ae1a8c188a2198ba089
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 04:57:15 +0800
Tag:    v2.6.0-beta

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

commit 1e6ac6957e920fcdcc5dc07d5402e33be4a4e79a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 04:45:43 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-30895-master' of https://github.com/mouneyrac/moodle

commit 8fa5ad621224573063afb8418f6ea9a95bb6b629
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 04:38:33 +0800
Tag:    v2.6.0-beta

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

commit 97907a85f103d2cbf9775906d93cc445da011d49
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 04:36:01 +0800
Tag:    v2.6.0-beta

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

commit 8e9709f8bfb4bd62f52ff6eaee67015b679268bc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 04:33:12 +0800
Tag:    v2.6.0-beta

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

commit d3fb29877edd41c35703958d845382043964f5f6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Aug 2013 10:23:10 +0800
Tag:    v2.6.0-beta

Merge branch 'w33_MDL-41086_m26_upgradecheck' of https://github.com/skodak/moodle

commit 63106eae7fa30cc80512b269c663b44b82f65886
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Aug 2013 10:03:30 +0800
Tag:    v2.6.0-beta

Merge branch 'w33_MDL-41073_m26_needsupgrade' of https://github.com/skodak/moodle

commit 8b7378cff02d6a9717f54bb57691db8cb2e957ae
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Aug 2013 08:11:07 +0800
Tag:    v2.6.0-beta

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

commit 61bec33f53704994cb750d65ba48ebf0bc381418
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Aug 2013 07:02:48 +0800
Tag:    v2.6.0-beta

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

commit 45f133884e7297a61dd6a1ac2ac920f11033951a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Aug 2013 06:38:06 +0800
Tag:    v2.6.0-beta

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

commit ec94685c4d5392564cb3be0f4aceaf54be75fd48
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Aug 2013 12:19:12 +0800
Tag:    v2.6.0-beta

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

commit f05ea82cdc82baf85f1b6d99556a167aa0da32aa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 07 Aug 2013 11:19:49 +0800
Tag:    v2.6.0-beta

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

commit d4519366f4dd66400dc524acaa1df32670c2611e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 07 Aug 2013 10:01:51 +0800
Tag:    v2.6.0-beta

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

commit 823c0c80e9f35843fffc72593b5ab7ac3f724915
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 07 Aug 2013 06:39:40 +0800
Tag:    v2.6.0-beta

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

commit 774b1089a583ab0cfb1a42f021b9c18b28f4bf65
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 07 Aug 2013 06:23:32 +0800
Tag:    v2.6.0-beta

Merge branch 'w32_MDL-40438_m26_textlib' of https://github.com/skodak/moodle

commit 36671670e117ee487d7c19fb545bb06acd4c9878
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 13:51:30 +0800
Tag:    v2.6.0-beta

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

commit d2132f02e2adfd67a0d2efd617fff1d3c0e0fab9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 13:45:16 +0800
Tag:    v2.6.0-beta

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

commit 9c83b82b1b95a1aa943a2a164e2a381ca8a8af26
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 13:39:41 +0800
Tag:    v2.6.0-beta

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

commit 2ad4a763ab052e6fcef19eaa7814e2f1a63d1aa8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 13:36:33 +0800
Tag:    v2.6.0-beta

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

commit 206f18c836b95006802b88cd5bb27b5bb453c365
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 13:31:14 +0800
Tag:    v2.6.0-beta

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

commit 5261f26e0e61be1bfb267f1405603205d15016ca
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 12:55:48 +0800
Tag:    v2.6.0-beta

Merge branch 'w32_MDL-41002_m26_enroltypo' of https://github.com/skodak/moodle

commit 1d92024f99f999d98932c26239b49494706c021e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 11:50:18 +0800
Tag:    v2.6.0-beta

Merge branch 'w32_MDL-41020_m26_umaskpermissionsnotice' of https://github.com/skodak/moodle

commit 17440b21980643f4a4be3f4fae3f667ec1fa42a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 11:38:18 +0800
Tag:    v2.6.0-beta

Merge branch 'w32_MDL-40815_m26_deprevent' of https://github.com/skodak/moodle

commit 68736bd623f3586286792e641d37e0a07350efb7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 10:47:38 +0800
Tag:    v2.6.0-beta

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

commit c3aefeb5a6a1667b4c7ed7383e7312c7c39855ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 10:39:49 +0800
Tag:    v2.6.0-beta

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

commit e145762b172995bfe61099d4f32e29ec0e7b4723
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 10:37:43 +0800
Tag:    v2.6.0-beta

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

commit 471dd4ff67427f094cb88aa45839c077868bc3f9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 09:59:23 +0800
Tag:    v2.6.0-beta

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

commit fe33106bb1f7c23d58f4bfda1519264747d88133
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 08:49:28 +0800
Tag:    v2.6.0-beta

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

commit 468ee9863d8e61129b891907199d5c1c733aae28
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 08:45:20 +0800
Tag:    v2.6.0-beta

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

commit c7c020aad2836f6d2e99a3da41fff5a067babbf2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 06:23:45 +0800
Tag:    v2.6.0-beta

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

commit 911b271215f916690889cdd2d119958b15bef8f5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 06:11:20 +0800
Tag:    v2.6.0-beta

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

commit b09abb05abd87b78c2361bb797a6026cfaba74a8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 04:53:24 +0800
Tag:    v2.6.0-beta

Merge branch 'w32_MDL-40901_m26_phpunitcleanup2' of https://github.com/skodak/moodle

commit 1eebbc28543823b9818e8c4fecafb431b3fad44f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 04:49:28 +0800
Tag:    v2.6.0-beta

Merge branch 'w32_MDL-40943_m26_observers' of https://github.com/skodak/moodle

commit 6aed99dd0a5298edb37b43b81eebc3e1f201e3b2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 11:46:59 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40937_assignment_history' of git://github.com/davosmith/moodle

commit 2c5c56e974a1de3564b729c2b065df80ccb3dd1e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 11:37:37 +0800
Tag:    v2.6.0-beta

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

commit 176a60227d0fc9831663c76165e0a62b919e64da
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 11:33:09 +0800
Tag:    v2.6.0-beta

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

commit 4c7f0562d07c6d81ec28cf0aacd5cfd8392ddbde
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 10:38:47 +0800
Tag:    v2.6.0-beta

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

commit 2b80bb33dfa3d309f3f0df6c226760eeefa9f86c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 10:15:27 +0800
Tag:    v2.6.0-beta

Merge branch 'w32_MDL-40995_m26_minifyreworked' of https://github.com/skodak/moodle

commit 335fcfa4f91432616a884decaac9f779b6d460d1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 10:06:26 +0800
Tag:    v2.6.0-beta

Merge branch 'w32_MDL-41017_m26_purifier' of https://github.com/skodak/moodle

commit 324b489bdba84f35586ae8c908301a6857ead99f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 09:36:56 +0800
Tag:    v2.6.0-beta

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

commit b3db9ddaf88eb06fed12475294ea9ccdcab09246
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 02 Aug 2013 04:11:35 +0800
Tag:    v2.6.0-beta

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

commit 4a4d57ae1fa5cd974b78fc8ad27a99bae9d6dc81
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Aug 2013 05:47:57 +0800
Tag:    v2.6.0-beta

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

commit 6867a78d7513076ed5bdb061b6544882f8baa519
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 31 Jul 2013 05:11:22 +0800
Tag:    v2.6.0-beta

Merge branch 'w31_MDL-39430_m26_opcache' of https://github.com/skodak/moodle

commit 56c3e4762f555c11b6ec172742e85d0e6415e60d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 06:36:49 +0800
Tag:    v2.6.0-beta

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

commit c6457b8acf686ea20ac9b8462d6abdbf744e2556
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 06:21:38 +0800
Tag:    v2.6.0-beta

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

commit 4960ca0738b7b75301312b6f7a58c217438a7a90
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 06:19:41 +0800
Tag:    v2.6.0-beta

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

commit a2d847842e244da15582fe04ce2d67278f5ed3ef
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 05:40:40 +0800
Tag:    v2.6.0-beta

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

commit 816f873068b6ca7851942ef814f1d2c2ff842465
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 05:39:03 +0800
Tag:    v2.6.0-beta

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

commit 867eba7641069d0aa9f6bd509e16f910ff0cc6ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 05:33:56 +0800
Tag:    v2.6.0-beta

Merge branch 'w31_MDL-39786_m26_metarole' of https://github.com/skodak/moodle

commit 6cef3dfe8eabb257034bea8d27b416c383a2dc3f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 04:59:58 +0800
Tag:    v2.6.0-beta

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

commit 0d33dbd9b87a77d397c6e5c53e4a4319a552e4e4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 04:58:14 +0800
Tag:    v2.6.0-beta

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

commit 73b4c1da844fcff99c8c21a54a8d05b0dc95d82d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 04:55:35 +0800
Tag:    v2.6.0-beta

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

commit fb947a424a86384795709ff2dc93f9f0c6b34723
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 04:47:34 +0800
Tag:    v2.6.0-beta

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

commit 84522488819a4eacbc15612fa9db1c897ca649c8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 09:05:07 +0800
Tag:    v2.6.0-beta

Merge branch 'w31_MDL-11270_m26_nvarcharmax' of https://github.com/skodak/moodle

commit 1091c534450a83862485aab8d2968f7bd5e2e310
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 08:54:31 +0800
Tag:    v2.6.0-beta

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

commit 609bda269ed2e3d3b79526d65015c47e47b3e9b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 07:53:02 +0800
Tag:    v2.6.0-beta

Merge branch 'w31_MDL-40891_m26_mkdirrace' of https://github.com/skodak/moodle

commit fa198e6346bdf9174524f3350b9e6e9eb01be5a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 07:50:00 +0800
Tag:    v2.6.0-beta

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

commit db5ee815762a9abf3caf6c75457608730dc3be7b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 07:01:57 +0800
Tag:    v2.6.0-beta

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

commit cfafbd1270c0f21b1e9622a377250a902cacc15d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 06:53:05 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40005_lti_headers' of git://github.com/moodlerooms/moodle

commit 6269efd29b84d6c54c2f08140f17e50d3c464b96
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 06:49:40 +0800
Tag:    v2.6.0-beta

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

commit feb34ff4e87ffb342e435ea9aeaa6aff7d5cea7e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 24 Jul 2013 15:19:47 +0800
Tag:    v2.6.0-beta

Merge branch 'w30_MDL-23493_m26_fonts' of https://github.com/skodak/moodle

commit 904c38b31deb41ff22a923f54d999d455395d5a7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 24 Jul 2013 07:28:26 +0800
Tag:    v2.6.0-beta

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

commit d853f819dcb014c803f567ab1928517cba395954
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 24 Jul 2013 07:14:14 +0800
Tag:    v2.6.0-beta

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

commit deeae9c1553e62d227c9fd1dd3b0776ce405de82
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Jul 2013 10:14:27 +0800
Tag:    v2.6.0-beta

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

commit 18474f822b196e9e5af1b924a5253293897f41b7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Jul 2013 10:09:08 +0800
Tag:    v2.6.0-beta

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

commit 97ff2341b37cd57f16a716c2bd50221c0354e03c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Jul 2013 09:59:16 +0800
Tag:    v2.6.0-beta

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

commit 07724a9ceee993bbcc805b65990d74e0d70bd9c3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Jul 2013 08:00:59 +0800
Tag:    v2.6.0-beta

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

commit 031ef3f871e452bdbfc3ece5fb2c67a522aae92d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Jul 2013 07:57:50 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40670-master' of git://github.com/barbararamiro/moodle

commit 092a99ef08c4d2920e030b80338c481a3aae56d8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Jul 2013 07:12:39 +0800
Tag:    v2.6.0-beta

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

commit d0ed9d6375812548a7f0d6500e8bd43b6dd3258b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Jul 2013 07:12:34 +0800
Tag:    v2.6.0-beta

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

commit 374f7b1d287d6edc0487066f2ad02269987a1eca
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Jul 2013 07:07:53 +0800
Tag:    v2.6.0-beta

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

commit 0ad4bcd102d8311738c344615c1425f2de9e8052
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Jul 2013 07:06:08 +0800
Tag:    v2.6.0-beta

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

commit 6426d2d26433dfb83d12629deb7644beacc9bb39
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 08:19:05 +0800
Tag:    v2.6.0-beta

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

commit 93b4d2658a97d2a74d857bf08802dbd8c7e33c14
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 07:07:00 +0800
Tag:    v2.6.0-beta

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

commit 1be1f6be53d9e877b92a97dd52dd64519f0da728
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 07:02:21 +0800
Tag:    v2.6.0-beta

Merge branch 'w28_MDL-40450_m26_tinymcebuttons' of https://github.com/skodak/moodle

commit ccae3a612d2c2b2ac396e8e7ef9b293698c4e7b8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 06:43:28 +0800
Tag:    v2.6.0-beta

Merge branch 'w28_MDL-40537_m26_majorupgrade' of https://github.com/skodak/moodle

commit 4e6ad78679bcc70bf88f1ad3cc238fc6c0fe7e10
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 06:35:18 +0800
Tag:    v2.6.0-beta

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

commit a8402cc115c6dbdae78612eba50130f3ed10f46f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 06:31:39 +0800
Tag:    v2.6.0-beta

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

commit a4fd82ac754b0939da0cadbabe371fa86287746a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 06:19:13 +0800
Tag:    v2.6.0-beta

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

commit 33ed6a9d94260bb4836ec4367a16f145ab26b611
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 06:12:44 +0800
Tag:    v2.6.0-beta

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

commit 05fb99ac705c0a0a4155417fd914d6b98470e604
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 06:10:11 +0800
Tag:    v2.6.0-beta

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

commit fc7e5a031edd32fa8a0d44d898da568d54a5e2e7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 05:54:38 +0800
Tag:    v2.6.0-beta

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

commit 59cd82f9b7597706d7988de68b7ec61142bb965c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 05:51:15 +0800
Tag:    v2.6.0-beta

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

commit a13ee8e18a139ffdd44bdc482777125ae2f53a62
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Jul 2013 10:42:03 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40402-master2' of git://github.com/ankitagarwal/moodle

commit 93b2977d9d9cf103218c5f0afde705911aa3a2ce
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Jul 2013 06:31:48 +0800
Tag:    v2.6.0-beta

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

commit 6ee9989d259ebb0272853c963631d53830527843
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Jul 2013 09:48:05 +0800
Tag:    v2.6.0-beta

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

commit e962fe0871715aff48a1b4a11e3ca390755a0d6b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Jul 2013 09:22:27 +0800
Tag:    v2.6.0-beta

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

commit 88abda50aabcc798a0fdaf00e2b6ba8388c6807f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Jul 2013 09:08:31 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-35206-email-links' of git://github.com/mudrd8mz/moodle

commit 4eba7399ad6bbfd78aa024859d29d12b4b16efc8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Jun 2013 08:19:30 +0800
Tag:    v2.6.0-beta

Merge branch 'w26_MDL-40305_m26_phpunitloader' of https://github.com/skodak/moodle

commit 49eef7d82d7366c180903ab2a95fb8f3511a7527
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Jun 2013 07:35:57 +0800
Tag:    v2.6.0-beta

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

commit a1d472d8c60afc8932b4c2099038a10ee0393831
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Jun 2013 06:59:29 +0800
Tag:    v2.6.0-beta

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

commit 10a741cc64cc9778d4e7dc18508c2f77446dfc5a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Jun 2013 05:59:24 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-40065-master_4' of git://github.com/gjb2048/moodle

commit cbc4b33afdb3f5910a2445c06e72f7d3df81448d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Jun 2013 05:13:16 +0800
Tag:    v2.6.0-beta

Merge branch 'w26_MDL-40289_m26_badgescaps' of git://github.com/skodak/moodle

commit c7b6c86a49a3a01424362e435bc1df256518be7c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 11:43:19 +0800
Tag:    v2.6.0-beta

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

commit 109a2ff00e5c2c55854d4ba430a387759c368e93
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 11:15:01 +0800
Tag:    v2.6.0-beta

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

commit 4ba45e3955ffc0479f8365df076c64a2d87b0d47
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 10:43:00 +0800
Tag:    v2.6.0-beta

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

commit 7bb2a9586e87395bb56a9fdf2198631d960240ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 10:30:49 +0800
Tag:    v2.6.0-beta

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

commit 615a5aa6f1a766c7223f0d0a9e1a2c80342df66e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 10:19:20 +0800
Tag:    v2.6.0-beta

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

commit f8dcecfd07e792b1cfe9ace617ea71f15a51f61b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 07:44:20 +0800
Tag:    v2.6.0-beta

Merge branch 'mdl26dev-MDL-40130-let-course-category-caching-be-used' of git://github.com/brki/moodle

commit 1d713c7c53f1e73b3a45edfafc04f385dd6733b8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 07:42:29 +0800
Tag:    v2.6.0-beta

Merge branch 'w26_MDL-40294_m26_plugininfo' of https://github.com/skodak/moodle

commit 2d9161791f7787b2180fdb8169a355d997ed0a36
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 07:22:30 +0800
Tag:    v2.6.0-beta

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

commit 8448a12a33877a0b1fcd270ceba41617709c76f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 06:30:19 +0800
Tag:    v2.6.0-beta

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

commit 0b20ce2841d7b718c512171cc8afae4427467331
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 06:00:20 +0800
Tag:    v2.6.0-beta

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

commit ef03bb6d9fdeacb5d105b30fef2c11be743c1815
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 04:57:44 +0800
Tag:    v2.6.0-beta

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

commit 11fb83fee808e5e437dbbbb95f76a7187e95f374
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 19 Jun 2013 10:06:41 +0800
Tag:    v2.6.0-beta

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

commit 9d109ad60df4deb1099150a43c83e95e67587cc1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 19 Jun 2013 05:13:30 +0800
Tag:    v2.6.0-beta

Merge branch 'w25_MDL-33955_m26_curlredir' of git://github.com/skodak/moodle

commit ef6650f703a5625d95f42445af9a5fb50d2d88d7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 11:35:37 +0800
Tag:    v2.6.0-beta

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

commit 07cfd5e599140c8e7063441188700f572c8be03e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 11:34:30 +0800
Tag:    v2.6.0-beta

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

commit 36096f0fe921bc50114d1b1321dc022b4326a1d3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 10:51:06 +0800
Tag:    v2.6.0-beta

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

commit 0f8d5064f1ac1a783f653cbebb4e4ead5cff9634
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 10:47:25 +0800
Tag:    v2.6.0-beta

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

commit 5c8cfccad347d57fd99886b1ae96fb5c47aeedab
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 10:29:08 +0800
Tag:    v2.6.0-beta

Merge branch 'w25_MDL-26455_m26_installport' of git://github.com/skodak/moodle

commit 1b194c904762d067f81361ed48b5aaa714153a46
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 10:06:33 +0800
Tag:    v2.6.0-beta

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

commit ad3d3c2ba7eb02a00c0fb88695c114d930c4830c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 10:01:54 +0800
Tag:    v2.6.0-beta

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

commit 044bb690f8269196a4e31b8f9bfb22db0c2dc284
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 09:54:39 +0800
Tag:    v2.6.0-beta

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

commit d35d8311909a716b1f2b346b4787078e7cd03bef
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 07:38:05 +0800
Tag:    v2.6.0-beta

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

commit 407020ef8c096dacd2b7f67c6e04d6c9feab9ac2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 07:26:23 +0800
Tag:    v2.6.0-beta

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

commit 7d7a6e3c20a2daeef19f0cf17e39d52d63105c31
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 07:22:40 +0800
Tag:    v2.6.0-beta

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

commit 21467b44613422dfb9070f38030df33b327e09f6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 07:19:35 +0800
Tag:    v2.6.0-beta

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

commit 540a8f8499e0cf9160d75cb0abbb120b743b6e99
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 07:08:45 +0800
Tag:    v2.6.0-beta

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

commit e667bd9db0299a4c511af178af0aaf6841beade7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 07:03:21 +0800
Tag:    v2.6.0-beta

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

commit 007b5f5f35063a1554ac587d63efd785ae9a976d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 06:27:11 +0800
Tag:    v2.6.0-beta

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

commit 03d34e07c0390bdacfe4aaa5b7655e29cd8356d2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 06:04:18 +0800
Tag:    v2.6.0-beta

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

commit 68e33c29321a4ea3c3cd435010893523b119ccbd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 12:14:00 +0800
Tag:    v2.6.0-beta

Merge branch 'm26_MDL-40095_Completion_locked_Error_on_save' of https://github.com/scara/moodle

commit ca64174031bef45e8231745f60f08cf121154cba
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 11:45:56 +0800
Tag:    v2.6.0-beta

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

commit e4ce39c99fb8a68be2d53c7f5bd7fa661bc5633f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 11:43:31 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-40091-master' of git://github.com/satrun77/moodle

commit d63082454b6850c5cabec3b1bcd7939041a98a70
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 11:10:41 +0800
Tag:    v2.6.0-beta

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

commit e41ecc6260146fe3595e20db1d1ae39479454950
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 10:30:24 +0800
Tag:    v2.6.0-beta

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

commit 7d1d4137cac75313f7f32bcf31457edddeed6260
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 06:01:10 +0800
Tag:    v2.6.0-beta

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

commit 44df0d9aaa8e4905af73a24c28bdcd566461ea4c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 07:36:40 +0800
Tag:    v2.6.0-beta

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

commit e1e6c0dd4ca35b64de568ce6d0d865147863a653
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 06:21:45 +0800
Tag:    v2.6.0-beta

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

commit aae402010b49e51bd6844d9de45eaa8637fe6d55
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 06:14:14 +0800
Tag:    v2.6.0-beta

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

commit ac547b717af2727b5fc46a74efea47ef2c359f0e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:48:56 +0800
Tag:    v2.6.0-beta

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

commit ee4e6c04e20f4dbd68635a85cb9b1df497192dc5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:38:38 +0800
Tag:    v2.6.0-beta

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

commit 5d24aff39fbbc5a3ed7a5bb194e63bca6afd1d80
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:34:06 +0800
Tag:    v2.6.0-beta

Merge branch 'master_MDL-38019' of git://github.com/andyjdavis/moodle

commit 18a1f186db87adff8589a4e387ccc0b1341b396f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:08:55 +0800
Tag:    v2.6.0-beta

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

commit cc5468de0e5fca96790fcb72c1377dc092405c27
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:07:01 +0800
Tag:    v2.6.0-beta

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

commit 7b50002304418f46c36ea0c2cf642a7c57e44c50
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:04:22 +0800
Tag:    v2.6.0-beta

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

commit 9439d0506c59cd3cb7db2dd4099c6cec302c96c9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:00:24 +0800
Tag:    v2.6.0-beta

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

commit 9ce7b61e62eef0f4d739477bf4d8328d44eaf467
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 04:54:09 +0800
Tag:    v2.6.0-beta

Merge branch 'w24_MDL-38109_m26_pluginlist' of git://github.com/skodak/moodle

commit ec18f333bdebda9f21a8c8d5382f15311d206526
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 04:51:59 +0800
Tag:    v2.6.0-beta

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

commit 754fa1091627ecb6285c984daabf878bc52a87ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 04:48:00 +0800
Tag:    v2.6.0-beta

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

commit 30db96bd90b6b5aa5ede5de390479d446d0c98d6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 13:36:18 +0800
Tag:    v2.6.0-beta

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

commit 11ea436f4fe598e746f1e198e36d1600a85504f2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 13:31:51 +0800
Tag:    v2.6.0-beta

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

commit 2b46a31a3f57c1dae0c01f5f8cc577c012aae3cc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 13:07:14 +0800
Tag:    v2.6.0-beta

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

commit ae82c2858895baa9a0d41c3a6d07d7e78e616a46
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 10:16:50 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39490-format_rewrite_order' of git://github.com/mudrd8mz/moodle

commit b9565a00709ba572486017e0beec88096b124c14
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 09:32:36 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-37490-m7' of git://github.com/gjb2048/moodle

commit 10c98b64e6b755fdff2d1e0b11d496543e8b105f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 08:26:55 +0800
Tag:    v2.6.0-beta

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

commit 5d37fd271d588145c14acbe1e24cf26148cdd1b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 07:06:17 +0800
Tag:    v2.6.0-beta

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

commit 9052fc4489844e0e8d17f6c684b984a88fd8fcd4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 06:35:10 +0800
Tag:    v2.6.0-beta

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

commit 2afd7d0277477f35c170b71df758ab96bd364ba6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 06:31:55 +0800
Tag:    v2.6.0-beta

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

commit bd7004d51c1e96dacfa6043941d70bb136ed86cd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 06:29:11 +0800
Tag:    v2.6.0-beta

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

commit 8affd1ca7e433402221cc8d75149a33a2a8220b6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 11:55:14 +0800
Tag:    v2.6.0-beta

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

commit b8904b6ad5e56decba9d2b1322858870813485a9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 11:49:04 +0800
Tag:    v2.6.0-beta

Merge branch 'w24_MDL-39549_m26_cohortsearch' of git://github.com/skodak/moodle

commit 56ad6d46d103d173ed5f2a749a0b62cad208bd47
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 11:09:43 +0800
Tag:    v2.6.0-beta

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

commit 018fc94211b5b8b85cae1615d7e342a53b4efd07
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 10:48:21 +0800
Tag:    v2.6.0-beta

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

commit bf0cdbcf8ae0a1a44a0dc2d6908dc081138747d7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 10:41:21 +0800
Tag:    v2.6.0-beta

Merge branch 'w24_MDL-32480_m26_imscp' of git://github.com/skodak/moodle

commit 111f5291f9437bb7a0f9f9beb24d2453fce6b48d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 10:26:04 +0800
Tag:    v2.6.0-beta

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

commit fb8010732e2800655ca814b0f8ad1a19ec6933b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 08:31:03 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-36090_log2' of git://github.com/andyjdavis/moodle

commit 2c0fb4c788446ffb3abab42f24b23167830d5faa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 08:14:17 +0800
Tag:    v2.6.0-beta

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

commit e559265c10265759569fe1d90510a1ebd58d234f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 07:43:31 +0800
Tag:    v2.6.0-beta

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

commit a6d966885bbccb608b5f8ad58e224dc2e4f5bdd8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 07:35:26 +0800
Tag:    v2.6.0-beta

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