Git merges in Moodle 2.2.x by Sam Hemelryk

commit 4e805e91c791d6dbbbe2e83fa61fc66d3735cd97
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 09:13:55 +0800
Tag:    v2.2.7

Merge branch 'MDL-37161-moodle22' of https://github.com/StudiUM/moodle into MOODLE_22_STABLE

commit e6f5bd2633ed1d7f311905632369618be3f1b0ab
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 08:39:32 +0800
Tag:    v2.2.7

Merge branch 'MDL-37068_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 75c6461ac17d3cf9287131cc369f0f30e1501499
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 05:14:40 +0800
Tag:    v2.2.7

Merge branch 'MDL-16730-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 0fbadb557b046c29ebb093acfdaed96bba2b3e70
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 05:01:13 +0800
Tag:    v2.2.7

Merge branch 'w51_MDL-37280_m22_langstring' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 146b7ac600754050c5479d8f6f2f6d244643116a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 04:15:21 +0800
Tag:    v2.2.7

Merge branch 'MDL-36741_m22' of git://github.com/markn86/moodle into MOODLE_22_STABLE

commit 9c829ef34a3dbab56bd9b3d3188836e1a1b004b1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 06:43:27 +0800
Tag:    v2.2.7

Merge branch 'wip-MDL-35833-stable22' of git://github.com/phalacee/moodle into MOODLE_22_STABLE

commit 7093fdd80639c794d5113b1d8a1c9c5e0df93082
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 04:40:24 +0800
Tag:    v2.2.7

Merge branch 'wip-MDL-35653-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit e49fea7d9b6c06bfb2b89087cd772f16e17f23cd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:11:53 +0800
Tag:    v2.2.7

Merge branch 'MDL-37176_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE

commit b61c5fa26ba850a60ab1ae7db9b1c446b57c1e04
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:06:54 +0800
Tag:    v2.2.7

Merge branch 'MDL-35530_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit 5ac84901f0869d164befdb8dea1c48f12eeb7681
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 04:56:48 +0800
Tag:    v2.2.7

Merge branch 'wip-MDL-35056-stable22' of git://github.com/phalacee/moodle into MOODLE_22_STABLE

commit 54d50fdb8dc8daeaa2eb3d61682bc335d3c12848
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 04:51:20 +0800
Tag:    v2.2.7

Merge branch 'MDL-32245_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 3ed2c641f481e1a14e08a67ba8c34bea2eb4bd58
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 04:41:52 +0800
Tag:    v2.2.7

Merge branch 'MDL-29733_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 9aca16cc0f05cdaf24edb5a6c89b75de58e11bf9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 06:09:20 +0800
Tag:    v2.2.7

Merge branch 'MDL-27619_22' of git://github.com/pauln/moodle into MOODLE_22_STABLE

commit 05e6fefd56ad7281e2a1674d4a2755bcda9821c1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:44:14 +0800
Tag:    v2.2.7

Merge branch 'MDL-29805-22' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit 6896e438c13ffda0ad27ce00b86dcf70987f880e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:38:14 +0800
Tag:    v2.2.7

Merge branch 'MDL-35593-22' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit 2a5953c545fed9d993049d9995bc38682ef34d09
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:34:19 +0800
Tag:    v2.2.7

Merge branch 'wip_22_mdl-37088_bad_operator_ldap_sync_user' of https://github.com/iarenaza/moodle into MOODLE_22_STABLE

commit f352dcddba680e448f379bd14dd54f65c3cad8a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 11:11:04 +0800
Tag:    v2.2.7

Merge branch 'MDL-36650_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit a4982907f85b2d69f4a4c23e08d15331de4a43eb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:04:11 +0800
Tag:    v2.2.7

Merge branch 'MDL-36942_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 7439256bbdb85ebbfe13cb0c6a51f4fdf829775d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 09:59:45 +0800
Tag:    v2.2.7

Merge branch 'MDL-36954_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 79b123d1bef6e58b0020dfd9caf07c291ecc7a34
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 04:41:29 +0800
Tag:    v2.2.7

Merge branch 'MDL-36601-MOODLE_22_STABLE' of git://git.luns.net.uk/moodle into MOODLE_22_STABLE

commit 6575ae513f735f0fa17319bbc977e08fe7648b82
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 04:14:47 +0800
Tag:    v2.2.7

Merge branch 'MDL-36805-MOODLE_22_STABLE' of git://git.luns.net.uk/moodle into MOODLE_22_STABLE

commit 59fef8ff26efe4f495d099f6da142c02f4abb163
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:59:19 +0800
Tag:    v2.2.7

Merge branch 'MDL-30961-22' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit 7c1b3e252366f9f02d864d77a2b3e41359c4f80e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:28:10 +0800
Tag:    v2.2.7

Merge branch 'MDL-34592_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit ba66ee75231535eee7e0b3e1a87928423fb6c1e8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:20:58 +0800
Tag:    v2.2.7

Merge branch 'MDL-36978_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit 9c11280dc9f29bd070bd7cf90d40298adcda5d40
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 06:51:08 +0800
Tag:    v2.2.7

Merge branch 'MDL-36778-22' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit 180a9220e97659cd5892f8d83997d50c1a338cc8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 06:42:22 +0800
Tag:    v2.2.7

Merge branch 'MDL-36640-MOODLE_22_STABLE' of git://git.luns.net.uk/moodle into MOODLE_22_STABLE

commit 7c3ff6f6a6b352126a05e8c152e94704777c1a09
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:58:37 +0800
Tag:    v2.2.7

Merge branch 'message_nav_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 4d0eabf19eacb39294be0a035b93c08458676136
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:53:47 +0800
Tag:    v2.2.7

Merge branch 'MDL-36761_loop_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 9980628209878b6fa3eed5a1b695bdbd4990a375
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:48:19 +0800
Tag:    v2.2.7

Merge branch 'MDL-34591_22' of git://github.com/grabs/moodle into MOODLE_22_STABLE

commit 59fdbc53b2464f0bd76d5642357894709901bb08
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:41:11 +0800
Tag:    v2.2.7

Merge branch 'wip-MDL-35221-MOODLE_22_STABLE' of git://github.com/kwiliarty/moodle into MOODLE_22_STABLE

commit e32da64ee478affe73436934a4329c8dd2c4735f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:33:20 +0800
Tag:    v2.2.7

Merge branch 'wip-MDL-36906-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit 624e1d1197a38a1b8dff226e7bab3ba0880eca64
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:26:55 +0800
Tag:    v2.2.7

Merge branch 'wip-MDL-36915-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit 0cdd8fe9d470642400182f969d38a09a40669e90
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:23:25 +0800
Tag:    v2.2.7

Merge branch 'wip-MDL-37026-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit 6b02b455a4341d97f19f21a0dafe1eaa2cbdbd4b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:19:13 +0800
Tag:    v2.2.7

Merge branch 'MDL-33125_22' of git://github.com/aolley/moodle into MOODLE_22_STABLE

commit e6ee93d1a3ffa32c53d0fd7163d4837193956b68
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 28 Nov 2012 06:47:41 +0800
Tag:    v2.2.7

Merge branch 'MDL-36336_MOODLE_22_STABLE' of git://github.com/moodlerooms/moodle into MOODLE_22_STABLE

commit 479f5b6e6d60af46f16bc1aaa944378d684a77dd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 28 Nov 2012 06:40:30 +0800
Tag:    v2.2.7

Merge branch 'wip-mdl-36238-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 8725c4401bf9d7ebc61353734a48f1d4c0b4ada1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Nov 2012 06:21:46 +0800
Tag:    v2.2.7

Merge branch 'wip-MDL-36795-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit d6347b056df3276710c14ced12ca89ecf2d49af7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Nov 2012 05:40:20 +0800
Tag:    v2.2.7

Merge branch 'MDL-36760_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit f3fc480228316c99ef76edc4887f08adfd0c66f2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Nov 2012 09:57:31 +0800
Tag:    v2.2.7

Merge branch 'MDL-36609_m22' of git://github.com/markn86/moodle into MOODLE_22_STABLE

commit 066fc70ece13cea72aa5661aab7af30643bc0779
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Nov 2012 09:44:09 +0800
Tag:    v2.2.7

Merge branch 'wip-MDL-36551-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit b7696aa0b6d901e8740a06d42016b0c2ec51eb11
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Nov 2012 09:55:13 +0800
Tag:    v2.2.7

Merge branch 'MDL-36589_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit e3071745bbc38da2452eecad041609dc9fafe152
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Nov 2012 06:06:41 +0800
Tag:    v2.2.6

Merge branch 'MDL-36271_m22' of https://github.com/markn86/moodle into MOODLE_22_STABLE

commit 3e8532dadcb8d04ca8cbc73cda13abb6a9d1584a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Nov 2012 05:08:22 +0800
Tag:    v2.2.6

Merge branch 'MDL-31629-MOODLE_22_STABLE' of git://github.com/micaherne/moodle into MOODLE_22_STABLE

commit fdd57e090e235d994f3fc77bba46d31f1fcaaa9d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Nov 2012 11:27:15 +0800
Tag:    v2.2.6

Merge branch 'MDL-21625_b_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit 61f0581a022aa0cd8cdbd269461f7ce60f5c339a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 31 Oct 2012 05:15:18 +0800
Tag:    v2.2.6

Merge branch 'MDL-31934_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit e16c4341405be883688c83b4fa6df71b6c6b2faa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 12:36:33 +0800
Tag:    v2.2.6

Merge branch 'MDL-28235-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit b277186a4ecd594eefa707d9631626e5b343712b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 10:48:45 +0800
Tag:    v2.2.6

Merge branch 'MDL-35889-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 0be66059a24915f055071be2d22ac6a92b23cc52
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 07:59:02 +0800
Tag:    v2.2.6

Merge branch 'MDL-36076_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 15b3f4332662c431fe03a8d41e723705fe7f4c0e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 07:51:34 +0800
Tag:    v2.2.6

Merge branch 'MDL-36103_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit d3eb32a44e28d6c5d0a140700560b76ec8ecc05b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 17:41:19 +0800
Tag:    v2.2.6

Merge branch 'MDL-35412-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit d270f6c22d314dd43b8d2e24a3fc165586aede74
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 11:22:44 +0800
Tag:    v2.2.6

Merge branch 'MDL-35198-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit 0766ae0049b5772af6ca9e9cfa564e45345fa2f3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 06:36:12 +0800
Tag:    v2.2.6

Merge branch 'MDL-35634-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit c11496e22da1338f9d63c9865dbee1c224f03aa9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 06:02:24 +0800
Tag:    v2.2.6

Merge branch 'MDL-35211_M22' of git://github.com/kordan/moodle into MOODLE_22_STABLE

commit ac78fb7625c5f661878ecec7bbf2b65f41a7346f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 05:15:29 +0800
Tag:    v2.2.6

Merge branch 'MDL-35667_extra_credit_loop_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 4f012c5e581f28f4d5c655e92f28646eac02a02d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 05:05:52 +0800
Tag:    v2.2.6

Merge branch 'MDL-35730_22' of https://github.com/aolley/moodle into MOODLE_22_STABLE

commit bd465e3917e0ab451a7a18e5216431cc91d81b70
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 03 Oct 2012 05:07:04 +0800
Tag:    v2.2.6

Merge branch 'MDL-33829_22' of https://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit d5cb1a40966f9bea25173c97adb7bac2c3e94597
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Oct 2012 06:10:13 +0800
Tag:    v2.2.6

Merge branch 'm22_MDL-35472' of git://github.com/totara/moodle into MOODLE_22_STABLE

commit 4fd7c545cc321d59997d4b0d2b1e93f5a41150ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Oct 2012 05:45:44 +0800
Tag:    v2.2.6

Merge branch 'MDL-34257_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 7697512a90cf00c13581965d970057cfab2956a2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Oct 2012 05:15:19 +0800
Tag:    v2.2.6

Merge branch 'MDL-35547_22' of git://github.com/enovation/moodle into MOODLE_22_STABLE

commit 57264882c7fbde6bf4e6cf6c6f9caa21e7867c0c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Sep 2012 10:27:52 +0800
Tag:    v2.2.6

Merge branch 'wip-MDL-34476-stable22' of git://github.com/phalacee/moodle into MOODLE_22_STABLE

commit 414568e1446cbc58a41f46f65fc84a6af73b53ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Sep 2012 06:10:11 +0800
Tag:    v2.2.6

Merge branch 'MDL-34573_accessibility_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit d122b474567e9b1e560dd3eb6997ae3226910f63
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Sep 2012 04:32:41 +0800
Tag:    v2.2.6

Merge branch 'wip-MDL-34476-stable22' of git://github.com/phalacee/moodle into MOODLE_22_STABLE

commit 1b00f61d8763f5a9bc8e31a1f66133ff673fbc50
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Sep 2012 04:20:30 +0800
Tag:    v2.2.6

Merge branch 'MDL-31976-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 22d38f8b2ead8532882f26505be4b08e27444691
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Sep 2012 05:54:52 +0800
Tag:    v2.2.6

Merge branch 'MDL-34607-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 3b9ed3037f85b3dfc57b310a0de88a74d83876d0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:42:06 +0800
Tag:    v2.2.6

Merge branch 'MDL-35379-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 782a1b46330c514dc6cdbe695555610de540714e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:21:21 +0800
Tag:    v2.2.6

Merge branch 'MDL-35517_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE

commit d2621a28f58a015a8bf39392ce02d7c2f92c2071
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:05:35 +0800
Tag:    v2.2.6

Merge branch 'MDL-30889-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 04ec524d74dd1463d7fd053faf9c9123bca4a7cb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 13 Sep 2012 07:25:29 +0800
Tag:    v2.2.6

Merge branch 'm22_MDL-32125_forum_subscription_change_reflected' of git://github.com/kanikagoyal/moodle into MOODLE_22_STABLE

commit b7367b9638154dcc3c38c4657a266473fc0532e2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 13 Sep 2012 07:18:03 +0800
Tag:    v2.2.6

Merge branch 'wip-mdl-30667-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 0686d3dc4c1ef1e1207b75255e7cd2c67eb4e68d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 13 Sep 2012 07:12:37 +0800
Tag:    v2.2.6

Merge branch 'MDL-29872_c_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit b95d2cc35e531301d3081fca3f6dd991dcb69dbd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Sep 2012 06:27:40 +0800
Tag:    v2.2.6

Merge branch 'MDL-30829-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit ccbf68066bd381b0a5e240e992fedb923fad2d73
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:31:09 +0800
Tag:    v2.2.6

Merge branch 'MDL-34765-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 4340e2faace07f7eb45870cd789640515648a749
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:21:44 +0800
Tag:    v2.2.6

Merge branch 'MDL-30018_22' of https://github.com/stronk7/moodle into MOODLE_22_STABLE

commit 1db9d1e7ec24f7e37c91fdeddd4127b158ed708c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:18:31 +0800
Tag:    v2.2.6

Merge branch 'MDL-10259_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE

commit 22f55d840cf86cfa148027bfe7fa18259a90c438
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:10:39 +0800
Tag:    v2.2.6

Merge branch 'MDL-30857_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE

commit b818dfc2d7e3c316b4a00b884bade3e7c625c7b5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 08:06:04 +0800
Tag:    v2.2.6

Merge branch 'MDL-34916_M22' of git://github.com/kordan/moodle into MOODLE_22_STABLE

commit 94ff6cf6fb261c9274d42bcc71792936df51adb4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 07:15:14 +0800
Tag:    v2.2.6

Merge branch 'MDL-27786-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit f50e16d07e26736040db2792cc70ce9f31a7a807
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 07:10:15 +0800
Tag:    v2.2.6

Merge branch 'MDL-33374-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit e40113160683514c35043456aca5ce0c47ad73b6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 08:20:16 +0800
Tag:    v2.2.5

Merge branch 'MDL-31496_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE

commit c0941ec9963dc38be6c94113bacaf2ba1b01ea75
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 07:25:57 +0800
Tag:    v2.2.5

Merge branch 'MDL-26882-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 926fffa1463316f62e55e350593be84fd056c3af
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 06:12:15 +0800
Tag:    v2.2.5

Merge branch 'wip-MDL-34318-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit 1ac4b314f6f1ceb948c012ecf6ab89eb213dc9e6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 05:52:12 +0800
Tag:    v2.2.5

Merge branch 'MDL-30020c-22' of git://github.com/srynot4sale/moodle into MOODLE_22_STABLE

commit 5d44dbd1eb2a2f7564a273a68a21f32f0266aa94
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 15 Aug 2012 07:21:57 +0800
Tag:    v2.2.5

Merge branch 'MDL-33531_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE

commit 5831c9f89103ce42edd39f4c05aecf3e85335623
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 08:04:40 +0800
Tag:    v2.2.5

Merge branch 'MDL-34708_m22' of git://github.com/nebgor/moodle into MOODLE_22_STABLE

commit 297e891c1fa4cc8e824f3f2f467ccbc9c5011d57
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 07:44:09 +0800
Tag:    v2.2.5

Merge branch 'MDL-34658-22' of git://github.com/grabs/moodle into MOODLE_22_STABLE

commit 07d8e5cfa7cd990b7e389fd68f634a5d71f86a94
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 07:04:47 +0800
Tag:    v2.2.5

Merge branch 'MDL-34645_22' of git://github.com/aolley/moodle into MOODLE_22_STABLE

commit f5543aa05e8c5ea5ed7c82ed1aad6bcfc4cd66af
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 06:58:18 +0800
Tag:    v2.2.5

Merge branch 'MDL-34647_22' of git://github.com/aolley/moodle into MOODLE_22_STABLE

commit b21f1749576804e087f3c3a0fcabbc5dd8da1fd8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:49:20 +0800
Tag:    v2.2.5

Merge branch 'MDL-34528_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit 6cb03ab5d34861e315e929f94c068008e7d28f39
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:40:37 +0800
Tag:    v2.2.5

Merge branch 'MDL-30515_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE

commit 09c3821bf47e6a4bf861bbeb7bcccc5d98f0dd4a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:29:41 +0800
Tag:    v2.2.5

Merge branch 'MDL-32499_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE

commit dd204f3a8f660d2f0229d64bb291962d35dc2f8f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:18:41 +0800
Tag:    v2.2.5

Merge branch 'MDL-32931_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE

commit ab474e3e6d2c033687ac5852535a5f378ecd2078
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:15:49 +0800
Tag:    v2.2.5

Merge branch 'MDL-32827-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit d3fd4849ae74dbb0f488965027c2615d4bb89956
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 07:59:02 +0800
Tag:    v2.2.5

Merge branch 'MDL-28568_noncontact_warning_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 775673d4b16d311b27411772c9eb882da4da8143
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Jul 2012 05:18:06 +0800
Tag:    v2.2.5

Merge branch 'MDL-27083-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 0fd928ddeb35a4476a856538b35a1a107d652aa0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 08:25:09 +0800
Tag:    v2.2.5

Merge branch 'MDL-33560-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 71268ddb625d110db3de4e8125d0a5182217fbbd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:49:28 +0800
Tag:    v2.2.5

Merge branch 'MDL-29563_22' of https://github.com/dmonllao/moodle into MOODLE_22_STABLE

commit 82bb3c039caa75a3409ee1aee4136804c0bf81e9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:37:59 +0800
Tag:    v2.2.5

Merge branch 'm22_MDL-34374' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit 5e202b6cb4991990381f33cc85d2b107780b0c16
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:26:41 +0800
Tag:    v2.2.5

Merge branch 'm22_MDL-34233' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit 5f6c20bca20bfdbbfd2c1f5dd8cfabd3e6745588
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 06:39:30 +0800
Tag:    v2.2.5

Merge branch 'MDL-34265-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit bff217f18b095e3dfc56912ceba41ba54fbf342a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Jul 2012 11:50:00 +0800
Tag:    v2.2.5

Merge branch 'MDL-33575_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit f1cb47f9a38ec2a5cb193d86479f3afb5c57a9c7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 09:50:48 +0800
Tag:    v2.2.5

Merge branch 'MDL-33624-22' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit 3c0d5ff61e1fa2aff35e0ea125bd896234e4115e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 07:57:25 +0800
Tag:    v2.2.5

Merge branch 'MDL-26145_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE

commit a9fb701ad52d7640e5ec68825704b9b3eaee74c3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 07:50:13 +0800
Tag:    v2.2.5

Merge branch 'MDL-28155_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE

commit aa83dea5e81860276188223c56a50bab5d17fb72
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 07:00:49 +0800
Tag:    v2.2.5

Merge branch 'MDL-32310-22' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit 0cc403cbe6138f3122ec15aa910c6c7617c525a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 06:49:57 +0800
Tag:    v2.2.5

Merge branch 'MDL-33917-2' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit 9f55156eb484e52710479b19eb94616947ee1394
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 05:18:36 +0800
Tag:    v2.2.5

Merge branch 'MDL-33788b-22' of git://github.com/srynot4sale/moodle into MOODLE_22_STABLE

commit f163de5a8ccb9058f3286b4956332626b3cd7e75
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 12 Jul 2012 14:24:36 +0800
Tag:    v2.2.5

Merge branch 'MDL-32297-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 714f2d590a322cb1d4d84c0d1d6d085f14000af4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 08:09:14 +0800
Tag:    v2.2.5

Merge branch 'MDL-29470-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 730ff61856b2a64f60c2b3804cdfb2b81507f83d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 08:05:42 +0800
Tag:    v2.2.5

Merge branch 'MDL-32297-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit df4066677524729402f73fce9279a92603032c56
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 06:28:37 +0800
Tag:    v2.2.5

Merge branch 'MDL-30816_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit 8e7d4f331720566f8d1c62d5459106363295b0e6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 06:24:23 +0800
Tag:    v2.2.5

Merge branch 'MDL-33514-22' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit ce70f9d0f71360b4b55ec4e1fa7196798197f476
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 06 Jul 2012 05:49:32 +0800
Tag:    v2.2.4

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit e0c7cb6ffa8b3a85484368c381e770c8536c5492
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 09:14:48 +0800
Tag:    v2.2.4

Merge branch 'MDL-32614_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE

commit c0c6e7966e62fbefefce4504d23818fa92678adf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 05:53:40 +0800
Tag:    v2.2.4

Merge branch 'MDL-32062_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit dcce2171604e77299480c200cbe90fc3ff3ce09f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 05:42:30 +0800
Tag:    v2.2.4

Merge branch 'MDL-32851-22' of https://github.com/mackensen/moodle into MOODLE_22_STABLE

commit 56861454c1cf2be10bf5f146b3d78973c53e3cff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 04:25:46 +0800
Tag:    v2.2.4

Merge branch 'wip-mdl-32787-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 06a3ab6c0b82b2fff17d3d7fca25761e10f6a300
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 10:57:23 +0800
Tag:    v2.2.4

Merge branch 'wip-MDL-33957-stable22' of git://github.com/phalacee/moodle into MOODLE_22_STABLE

commit b16832db0d70ce2a343de356e9dbfa79efaf89f8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 07:48:16 +0800
Tag:    v2.2.4

Merge branch 'MOODLE_22_STABLE-MDL-33770' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit 461499b836058b968db70e45ff713302dabb3d6b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 10:31:43 +0800
Tag:    v2.2.4

Merge branch 'MDL-33932_22' of git://github.com/grabs/moodle into MOODLE_22_STABLE

commit 803122e110a09bf482c65212b2176b0aaf663701
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 10:05:57 +0800
Tag:    v2.2.4

Merge branch 'MDL-33627_22' of git://github.com/grabs/moodle into MOODLE_22_STABLE

commit 1d2b991046ced8bb85f6e6d0d29ba966797f3ccf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 04:22:26 +0800
Tag:    v2.2.4

Merge branch 'MDL-34044-22' of git://github.com/srynot4sale/moodle into MOODLE_22_STABLE

commit b917d504a3a2ca7fb294d38f298fe80d02308aa8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 21 Jun 2012 07:29:32 +0800
Tag:    v2.2.4

Merge branch 'MDL-27675_22' of git://github.com/grabs/moodle into MOODLE_22_STABLE

commit 217926aaa14fb672e8eb2c660637cca87dfbf402
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 21 Jun 2012 06:06:32 +0800
Tag:    v2.2.4

Merge branch 'MDL-33808-22' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit 29515af1d8c917e5f1e42c82ed94e41182a0989c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 08 Jun 2012 06:23:04 +0800
Tag:    v2.2.4

Merge branch 'MDL-33080_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE

commit 52b6c9bc01df1fad656cf352e336c3c3b9f3468e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 08 Jun 2012 06:20:37 +0800
Tag:    v2.2.4

Merge branch 'MDL-32325-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 50eb136630921c907498495ba65ae5d7145146be
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 11:37:28 +0800
Tag:    v2.2.4

Merge branch 'MDL-33090_22-missing-xmldb-strings' of git://github.com/rlorenzo/moodle into MOODLE_22_STABLE

commit 57dd3c69097ce4bbecdbc4b6ac31bc92400af2e9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:59:43 +0800
Tag:    v2.2.4

Merge branch 'MDL-30837-22' of https://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 65d7459b6d50c542a3493ee566bd72f02645c20a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:37:36 +0800
Tag:    v2.2.4

Merge branch 'MDL-31520-MOODLE_22_STABLE' of git://github.com/fabiomsouto/moodle into MOODLE_22_STABLE

commit 6a27fc8b341d77ca488c34a834ec0cacd7d40623
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:25:06 +0800
Tag:    v2.2.4

Merge branch 'MDL-33353_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE

commit 9331c1ec8c47c75b72f3cf2d956de52a6d3ecaca
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:13:39 +0800
Tag:    v2.2.4

Merge branch 'MDL-31823_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE

commit 46d433f7011dcfbeae3c9fcbdd54adbcb83556f1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:09:54 +0800
Tag:    v2.2.4

Merge branch 'MDL-33441-22' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit 928a51ad3d6b3877ca9b38975415e1089263bc60
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:06:05 +0800
Tag:    v2.2.4

Merge branch 'MDL-33487-22' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit 042ae10e1d1ea797d160498e6dbbe566ab981a38
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 05:07:17 +0800
Tag:    v2.2.4

Merge branch 'MDL-26277-22' of https://github.com/mackensen/moodle into MOODLE_22_STABLE

commit 5a3f6eb468de6a4c27daecc10693bdf5e3fd77e8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 09:51:09 +0800
Tag:    v2.2.4

Merge branch 'MDL-33364_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE

commit e5d6cd54616007b5593f7833b001fd51fa94136c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 07:44:18 +0800
Tag:    v2.2.4

Merge branch 'MDL-27675_22_wip' of git://github.com/grabs/moodle into MOODLE_22_STABLE

commit dcd5d0840bc288e09b60225bb5d7e57805518640
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 07:21:58 +0800
Tag:    v2.2.4

Merge branch 'MDL-33191_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit d48f4d2f75eebe5ce235b5cdeaa2983ccd7a44c2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 06:52:12 +0800
Tag:    v2.2.4

Merge branch 'MDL-33325-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 3d1e457e3e69961942fcbb4bdc69e4be886415e3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 May 2012 07:48:40 +0800
Tag:    v2.2.4

Merge branch 'MDL-32203c-22' of git://github.com/srynot4sale/moodle into MOODLE_22_STABLE

commit 05ceae9bb2e12dbf52d210b299bbd9f38e3c3bd3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 May 2012 06:56:16 +0800
Tag:    v2.2.4

Merge branch 'MDL-26562-22' of git://github.com/vadimonus/moodle into MOODLE_22_STABLE

commit 3e11be405b25ebef9fab1413634a5f76dc21f902
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 May 2012 10:49:23 +0800
Tag:    v2.2.4

Merge branch 'MDL-32204-mnet-auth_22' of git://github.com/mudrd8mz/moodle into MOODLE_22_STABLE

commit 843599ae8611fd3d512002a2aa38c4956834ff6d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 May 2012 08:27:37 +0800
Tag:    v2.2.4

Merge branch 'm22_MDL-32794' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit f97184b9c9ad1ced09047a8344c451b18753309c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 May 2012 05:12:06 +0800
Tag:    v2.2.4

Merge branch 'MDL-31458-22' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit f818719f117a6a0c0c40dc00e4f93700225fc3be
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 May 2012 11:14:28 +0800
Tag:    v2.2.3

Merge branch 'wip-MDL-31763-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit 93af314f7895cf413ea3b63bd5e423b1c6f68c84
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 May 2012 07:45:57 +0800
Tag:    v2.2.3

Merge branch 'MDL-32164-MOODLE_22_STABLE-1' of git://git.luns.net.uk/moodle into MOODLE_22_STABLE

commit a1f173f7743c78bf882a339fb996b366a1ee10bf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 May 2012 07:31:40 +0800
Tag:    v2.2.3

Merge branch 'MDL-18095-MOODLE_22_STABLE-1' of git://git.luns.net.uk/moodle into MOODLE_22_STABLE

commit f4e4ac8c59c7767ded9e3b26755225a758d0245c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 May 2012 14:06:52 +0800
Tag:    v2.2.3

Merge branch 'MDL-32670_22' of git://github.com/rlorenzo/moodle into MOODLE_22_STABLE

commit 329920fa2260d8a7ba1326ecdbc8725f3d97ebf5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 May 2012 13:41:52 +0800
Tag:    v2.2.3

Merge branch 'MDL-31671-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit d0eeb25a6478c630f744ddcfa68230cbcc471fdd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 09:33:53 +0800
Tag:    v2.2.3

Merge branch 'w18_MDL-32607_m22_upgrade2' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 0ee1c3db00e17e89e81f390232ddf6c4883358e9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 09:17:12 +0800
Tag:    v2.2.3

Merge branch 'MDL-28955_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit fc3a00dc64447eb71e5f74b382e3a581c50b4d90
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 08:37:42 +0800
Tag:    v2.2.3

Merge branch 'MDL-32012_m22' of git://github.com/merrill-oakland/moodle into MOODLE_22_STABLE

commit 44835cdc8b9676ca1f328d6533d29040d3a6d028
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 04:23:48 +0800
Tag:    v2.2.3

Merge branch 'MDL-29264_zindex_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 3464845868243a5a9d37af18f3a475c57fe38297
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 09:21:49 +0800
Tag:    v2.2.3

Merge branch 'm22_MDL-32597' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit 390c3bc54a16f1e427d2813e8ed290273cb9cedd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 09:15:03 +0800
Tag:    v2.2.3

Merge branch 'MDL-28735-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit ead5f3793b1e1ba20ccb85c422b56b32998fc73e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:46:37 +0800
Tag:    v2.2.3

Merge branch 'MDL-26523_grader_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit b5907a8674c7a56358346084509204944e2ab018
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:33:40 +0800
Tag:    v2.2.3

Merge branch 'MDL-31429_paypal_messages_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 8a8f68ff976e8059f14d14713f3f519e91f447f5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:11:12 +0800
Tag:    v2.2.3

Merge branch 'MDL-31510_group_activities_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit b969338742d41c268226d7ef99c7c9f3b06eb131
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:02:50 +0800
Tag:    v2.2.3

Merge branch 'MDL-32238-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit ba69b6952a9dfc5d9af231506ccb45d097841d77
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 07:57:26 +0800
Tag:    v2.2.3

Merge branch 'MDL-32624_22_wip' of git://github.com/grabs/moodle into MOODLE_22_STABLE

commit 5335b7deb828d5ce79e2a1bfe9fa020eb17924c5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 13:37:04 +0800
Tag:    v2.2.3

Merge branch 'MDL-29174_MOODLE_22' of git://github.com/raymanuk/moodle into MOODLE_22_STABLE

commit 80bc3d98800e86aec55917e41f16a3dd1b1c558b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 13:06:09 +0800
Tag:    v2.2.3

Merge branch 'MDL-32385_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit 4a979297aa389604b95f28a98ada4038065e4f3d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 11:59:38 +0800
Tag:    v2.2.3

Merge branch 'MDL-32444_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit 11990142b0fddba131b7cd1e781c4c3da12c3c67
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 11:11:59 +0800
Tag:    v2.2.3

Merge branch 'MDL-32353_m22' of git://github.com/merrill-oakland/moodle into MOODLE_22_STABLE

commit 0656d45fbcdbcfa23515480f18ddea8b656604d1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 08:23:10 +0800
Tag:    v2.2.3

Merge branch 'm22_MDL-32388' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit 98a4be51768976022a63876ea40b60d09695ee49
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 07:45:36 +0800
Tag:    v2.2.3

Merge branch 'MDL-30819_grader_col_highlight_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 77b300ca5184d283f9d9c2b5dacdd5d9b44644f8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 07:34:26 +0800
Tag:    v2.2.3

Merge branch 'MDL-30955_forum_ratings_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit cb36e6ba4ab9e130c0d4d73003bd05551839b4ba
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 07:00:25 +0800
Tag:    v2.2.3

Merge branch 'MDL-32316_22_wip' of git://github.com/grabs/moodle into MOODLE_22_STABLE

commit b182c1238ef4d42e8bad2539089aa7cc35be21c6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 06:47:58 +0800
Tag:    v2.2.3

Merge branch 'MDL-27547-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit ec01a02d8b8092c3ae782f2b53ad4edd6dd02af8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 13:11:57 +0800
Tag:    v2.2.3

Merge branch 'MDL-32124_22_wip' of git://github.com/grabs/moodle into MOODLE_22_STABLE

commit b054ead121779a944a3d59668a2949c7cb182f2c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 07:01:37 +0800
Tag:    v2.2.3

Merge branch 'MDL-30843_b_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit 3f046db1501da3b9b047cb3b3e8fb5c59aff8096
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 06:53:19 +0800
Tag:    v2.2.3

Merge branch 'wip-mdl-32270-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit d9cc6b7a31cb95bd8f68b8fe3e5007541827e21b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 06:48:15 +0800
Tag:    v2.2.3

Merge branch 'w15_MDL-32263_m22_enroladmin' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 729ef697055379ea51e2e59b5b6bb74817579f85
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Apr 2012 04:21:52 +0800
Tag:    v2.2.3

Merge branch 'MDL-32137-MOODLE_22_STABLE-1' of git://git.luns.net.uk/moodle into MOODLE_22_STABLE

commit f65eadd42db932e9eb63dbd2dda8737f954df9b5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Apr 2012 06:32:53 +0800
Tag:    v2.2.3

Merge branch 'wip-mdl-32150-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 2de2d0d2cd9e6dffdfa50062b77428d3a361fadb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 10:31:08 +0800
Tag:    v2.2.3

Merge branch 'MDL-32239_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 0292c465fe726f36c647b7888e1c99241bf0489f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 07:27:55 +0800
Tag:    v2.2.3

Merge branch 'MDL-32256-cron-return_22_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_22_STABLE

commit 12376c971f543a69f80acd1f74ba9b59e5e0eb90
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 07:24:41 +0800
Tag:    v2.2.3

Merge branch 'MDL-32258-data-cron_22_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_22_STABLE

commit fc0acdfacda1a5e5e7444101aa7898c1c752b9a7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 06:16:20 +0800
Tag:    v2.2.3

Merge branch 'MDL-32289_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit ec202ddbbab08e8f219de04671215499af16864d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Mar 2012 06:03:08 +0800
Tag:    v2.2.3

Merge branch 'MDL-22510-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 015c334a7303be4d0c9cf465efc6c0524a26a71b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Mar 2012 04:51:28 +0800
Tag:    v2.2.3

Merge branch 'm22_MDL-32147' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit 2733a8c4d592f56058a155fd473bb8807c28c25a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Mar 2012 06:57:29 +0800
Tag:    v2.2.3

Merge branch 'wip-mdl-29331-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit abdbeec6bb873b6deb8e434a04f6d228ac819475
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Mar 2012 06:19:27 +0800
Tag:    v2.2.3

Merge branch 'MDL-29400' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit 292f509cfff0ef8d7c0a8d9734f7c71db14bfb1d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 23 Mar 2012 07:11:03 +0800
Tag:    v2.2.3

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit 89399cb129f8e5aa677352b911a69a7c521c9d64
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Mar 2012 04:50:13 +0800
Tag:    v2.2.3

Merge branch 'wip-mdl-31640-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 0d2001b756190b31ab4d73affc234e0fce633865
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Mar 2012 04:29:12 +0800
Tag:    v2.2.3

Merge branch 'MDL-28952-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit dff9c69fa8a5023795ee4c3eeb8c591de847e5db
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 08:41:20 +0800
Tag:    v2.2.3

Merge branch 'wip-MDL-32036-MOODLE_22_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_22_STABLE

commit 26777ab2c382207a9edb869010708add6a0bf029
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 08:33:17 +0800
Tag:    v2.2.3

Merge branch 'wip-MDL-32037-MOODLE_22_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_22_STABLE

commit e9d7fb3a8881318ccbfe594b1903464ba9d8bf51
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 06:40:01 +0800
Tag:    v2.2.3

Merge branch 'w12_MDL-32071_m22_dbfamily' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit e6c9fdb384005d729b4be278d1f97eebb6d76140
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 06:34:09 +0800
Tag:    v2.2.3

Merge branch 'w12_MDL-32079_m22_folderrev' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 33ce9928d89c9e329e083c45d37d48aece28cc96
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 05:37:27 +0800
Tag:    v2.2.3

Merge branch 'MDL-32064_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 2cd9cfcc974aa364f217c80da79e3962f740d74c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 15:38:14 +0800
Tag:    v2.2.3

Merge branch 'MDL-32084_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit a440a25c64754b809e929e0db847dff651df20c0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 15:33:38 +0800
Tag:    v2.2.3

Merge branch 'w12_MDL-32090_m22_groupui' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 56f55380a9c97fc2dd772db07ec5168219d510c7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 15:06:28 +0800
Tag:    v2.2.3

Merge branch 'wip-mdl-26674-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 8b66d25681e7b6688c39d3aa9cfbc586858a08ab
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 10:48:52 +0800
Tag:    v2.2.3

Merge branch 'wip-MDL-27064-stable22' of git://github.com/phalacee/moodle into MOODLE_22_STABLE

commit fc109fac2dc9ec604bffb2de8ea7ff841995af64
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 09:14:17 +0800
Tag:    v2.2.3

Merge branch 'MDL-28187_messaging_nav_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 3905c1f75b3fa07426049d13ad4345b0723e8475
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 09:07:05 +0800
Tag:    v2.2.3

Merge branch 'MDL-31835_recent_conversations_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit fb2e8f82c9ad37ae3fd8f8d854fc7708b00c0391
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 05:27:22 +0800
Tag:    v2.2.3

Merge branch 'MDL-30890_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit b87ca9b7132293a1b78454f7362905fc8368ed54
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Mar 2012 09:39:59 +0800
Tag:    v2.2.3

Merge branch 'wip-mdl-28972-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 999e6901c86899d8535b14b733204e1591aca335
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Mar 2012 06:30:06 +0800
Tag:    v2.2.3

Merge branch 'MDL-29440' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit 22dde645f4de78e0d59c43d1c3cfa2fed2d414a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Mar 2012 06:59:53 +0800
Tag:    v2.2.3

Merge branch 'w11_MDL-27457_m22_enrolnorecover' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit d254ae8cfe229bf2c999f047259d06e77f84f530
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Mar 2012 06:56:18 +0800
Tag:    v2.2.3

Merge branch 'MDL-30298_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit ec2b87aede6bd0acce391a4571d30c9c0ece9a45
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Mar 2012 05:33:39 +0800
Tag:    v2.2.3

Merge branch 'MDL-31702_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit b3fe3fb6c8b0b7f51d566775ead551c10a0733e5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 12:29:11 +0800
Tag:    v2.2.3

Merge branch 'm22_MDL-31888' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit 25ff180756b1cdbbe96f69af0906c8afa9180072
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 12:05:21 +0800
Tag:    v2.2.3

Merge branch 'MDL-27304-22' of https://github.com/mackensen/moodle into MOODLE_22_STABLE

commit cbb8087b306ae967a2604f212e2ba7ea84905966
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 12:02:07 +0800
Tag:    v2.2.3

Merge branch 'MDL-31664-22' of https://github.com/mackensen/moodle into MOODLE_22_STABLE

commit 840dc3cb947313953bee9092ef4116e4441d8b04
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 10:26:21 +0800
Tag:    v2.2.3

Merge branch 'MDL-28997-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 7ac10ac609a1978d10b5481d5ec8aaafe4fce2ce
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 09:22:10 +0800
Tag:    v2.2.3

Merge branch 'MDL-31841_feedback_align_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 113b864ffc71da7b594a958be40d9dc345e25ba2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 09:19:50 +0800
Tag:    v2.2.3

Merge branch 'wip-MDL-30906-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit deaf559402cd4eff1dd928487cb6e5ff018022c0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 07 Mar 2012 06:46:32 +0800
Tag:    v2.2.2

Merge branch 'MDL-28387-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit bd8718922292889739da98ecffc4f6a398cecdcf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Mar 2012 05:19:00 +0800
Tag:    v2.2.2

Merge branch 'MDL-27764_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE

commit 575a5530944f28dd67350265995470146503557e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 12:03:20 +0800
Tag:    v2.2.2

Merge branch 'MDL-31828_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 7d6c1a19bbdbe90deec1b033bdfc230d0568f33e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 11:56:05 +0800
Tag:    v2.2.2

Merge branch 'w10_MDL-31807_m22_cohort' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 94cfcb36a58566f96e12651f4e152686373637b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 11:13:08 +0800
Tag:    v2.2.2

Merge branch 'MDL-29347-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit 0c0ae1c6969121702b68b241b7ab5f3ee6f7da76
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 11:08:30 +0800
Tag:    v2.2.2

Merge branch '22_MDL-30724_count_real_submissions_eloy_suggests' of git://github.com/gerrywastaken/moodle into MOODLE_22_STABLE

commit f8c24829ab62249d2e9dcaeac08c9f45d22e6cbd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 10:21:19 +0800
Tag:    v2.2.2

Merge branch 'MDL-31707_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE

commit 4e738cab73ec2892bc031f2fddaa54031543655c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 09:03:26 +0800
Tag:    v2.2.2

Merge branch 'MDL-26037_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE

commit 62a2c4fd22cbe3678bfb4b121b5ae0fa3a77287c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 08:54:27 +0800
Tag:    v2.2.2

Merge branch 'MDL-29248_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE

commit bf4649edb544166ea8a9822cd95ff9299d7ae110
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 07:30:05 +0800
Tag:    v2.2.2

Merge branch 'm22_MDL-31749' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit e6f2103ce7a72e74b881802f0124b9e1c581cf21
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 07:22:19 +0800
Tag:    v2.2.2

Merge branch 'MDL-24235-22' of https://github.com/mackensen/moodle into MOODLE_22_STABLE

commit fecb44d7b5132df618807aef63686a236afb3dc7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 07:05:39 +0800
Tag:    v2.2.2

Merge branch 'MDL-31806-22' of https://github.com/mackensen/moodle into MOODLE_22_STABLE

commit c71b744a43ac40eca6fc3385e82b24bec8153de6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 06:52:45 +0800
Tag:    v2.2.2

Merge branch 'MDL-30893-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 5c3c0a8ce5c61b1582a70713f6435627782186d2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 06:30:53 +0800
Tag:    v2.2.2

Merge branch 'MDL-31466-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit ebbb9143469e78ef2110e3fc93712fb89e7c913a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Mar 2012 09:34:52 +0800
Tag:    v2.2.2

Merge branch 'MDL-31831_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE

commit 68eeca86213a91d8ca169cdb85c80a16907949f0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 22 Feb 2012 05:21:53 +0800
Tag:    v2.2.2

Merge branch 'MDL-30910_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit 31593361a8eaf2257ed1f6e27d5f708777f9c70d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 21 Feb 2012 09:56:13 +0800
Tag:    v2.2.2

Merge branch 'MDL-30249-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit f2315259923bd97c855732aa050e307bf10b58a1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 21 Feb 2012 05:43:41 +0800
Tag:    v2.2.2

Merge branch 'MDL-29402-22' of https://github.com/mackensen/moodle into MOODLE_22_STABLE

commit ab04c70d56d8f4024a89a0c80d7a8fbec4223696
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 13:20:22 +0800
Tag:    v2.2.2

Merge branch 'wip-mdl-29967-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit ace2654b5d734281bfe0e369573d0af54c077112
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 13:06:06 +0800
Tag:    v2.2.2

Merged MDL-29254 with conflict resolution

commit c8072f8b508729f6ece7f56d683846d8ed5edcc8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 12:29:33 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-30780-MOODLE_22_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_22_STABLE

commit e86284fefd97dbbb47e7bd939b4ddb8b605d39ba
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 12:25:36 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-31627-MOODLE_22_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_22_STABLE

commit c63a91d44aaa65c558239509e05e663928b39e1f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 12:13:25 +0800
Tag:    v2.2.2

Merge branch '22_MDL-31388_fix_enrol_LDAP_typo' of git://github.com/gerrywastaken/moodle into MOODLE_22_STABLE

commit cf6fa5025d1146b7a3de1cc891dd6b787e04f551
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 12:10:39 +0800
Tag:    v2.2.2

Merge branch 'MDL-31532_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE

commit 5a91cf1e2a53119cdd41f1805845fe2195055ef2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 12:04:30 +0800
Tag:    v2.2.2

Merge branch 'm22_MDL-31381' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit 3ba632dce5fad8ee31e774fe3b7ae9738273a961
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 11:58:20 +0800
Tag:    v2.2.2

Merge branch 'MDL-31432_messaging_popup_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 10701ea8147d7d59fdb785ea9d86fba3a46a7fce
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 11:52:35 +0800
Tag:    v2.2.2

Merge branch '22_MDL-30957_adding_assignment_completion_status_method_and_call' of git://github.com/gerrywastaken/moodle into MOODLE_22_STABLE

commit 7654fe581170eb7caf896ae2dd36ba77da8f642a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 11:03:08 +0800
Tag:    v2.2.2

Merge branch 'm22_MDL-31397' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit 34d7e1ce9b96225f9ef20676cd3a33470e8b3afa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 10:53:36 +0800
Tag:    v2.2.2

Merge branch 'm22_MDL-31652' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit 6f22c38b483be44c9ba2b7cf64c24fc3fbd0995c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 10:44:47 +0800
Tag:    v2.2.2

Merge branch 'MDL-30965-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit a55688b394fc66589313c30680acb9599d0c52a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 07:39:02 +0800
Tag:    v2.2.2

Merge branch 'MDL-31556_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit bc392be2a889940529de04a4d55e625e1e2e89c7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 06:54:30 +0800
Tag:    v2.2.2

Merge branch 'MDL-31647-m22' of git://github.com/sammarshallou/moodle into MOODLE_22_STABLE

commit 11a3fcb1be094820a86efce9b47942074ce35d75
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 06:50:39 +0800
Tag:    v2.2.2

Merge branch 'MDL-30495-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit 3fe335c455d8c80f0c46fbbab767d5782894daf7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 05:29:46 +0800
Tag:    v2.2.2

Merge branch 'wip-mdl-30521-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 124e846e833a7165947e786dae63c15645d89b92
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 16 Feb 2012 10:40:38 +0800
Tag:    v2.2.2

Merge branch '22_MDL-30935_lti_change_instructor_role_to_teacher' of git://github.com/gerrywastaken/moodle into MOODLE_22_STABLE

commit 646704c8d074e912a74fb4e9533a9000be6e0282
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 15 Feb 2012 11:23:33 +0800
Tag:    v2.2.2

Merge branch 'wip-mdl-30388-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit ebeacb73c9dbdebccf1374ac8bdf4f1e4f4717f3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 12:41:45 +0800
Tag:    v2.2.2

Merge branch 'MDL-30911_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit 43c6a29cc6e7acde499df610ef3058065e0cf861
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 12:14:22 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-30709-MOODLE_22_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_22_STABLE

commit 01348282b4ccf393d421d65befc44d93c95c6e71
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 12:00:25 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-30771-MOODLE_22_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_22_STABLE

commit 4e010423430311fedb2bef53f097a255634b0bde
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:53:46 +0800
Tag:    v2.2.2

Merge branch 'MDL-30688-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit 8348cea56a40230ce39407e0add19bd6c69b6264
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:48:09 +0800
Tag:    v2.2.2

Merge branch 'MDL-31604-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit 5129af80515d984c523362f19138be0f5dc2496e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:32:00 +0800
Tag:    v2.2.2

Merge branch '22_MDL-26807_remove_withselectedusers_strings_and_references' of git://github.com/gerrywastaken/moodle into MOODLE_22_STABLE

commit a6f81e7fd86765dbf86a40b5f3a46c580d4fcb3c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:27:57 +0800
Tag:    v2.2.2

Merge branch '22_MDL-27285_fixing_grammar_on_wiki_links_page' of git://github.com/gerrywastaken/moodle into MOODLE_22_STABLE

commit af61dca6d05e9fae63bd2b8f838672fe57f42640
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:21:07 +0800
Tag:    v2.2.2

Merge branch '22_MDL-27654_add_space_to_somefieldrequired_string' of git://github.com/gerrywastaken/moodle into MOODLE_22_STABLE

commit 03134095f9f9d3591497772598021884e60d0ebd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:12:22 +0800
Tag:    v2.2.2

Merge branch '22_MDL-30935_lti_change_instructor_role_to_teacher' of git://github.com/gerrywastaken/moodle into MOODLE_22_STABLE

commit 908de866bd1ea2808774585f9e2b0c464614aa5d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:08:13 +0800
Tag:    v2.2.2

Merge branch '22_MDL-31107_fixing_below_typos' of git://github.com/gerrywastaken/moodle into MOODLE_22_STABLE

commit 01080b468fa24a29b9d346889a74646bc02d8ef5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 08:59:04 +0800
Tag:    v2.2.2

Merge branch 'MDL-28283-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 66bd7ae432d0e2ec210d5bf10dcfd3053c6bc6b4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 08:44:52 +0800
Tag:    v2.2.2

Merge branch 'MDL-30815-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 2787eeb9b32575c175f27ac11a38b087d6473be9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 05:47:30 +0800
Tag:    v2.2.2

Merge branch 'MDL-29080_export_hidden2_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit bc967db3d45a17a5c99e96a7a4af093e0250da5a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 13:04:06 +0800
Tag:    v2.2.2

Merge branch '22_MDL-29153_fix_typo_in_resource' of git://github.com/gerrywastaken/moodle into MOODLE_22_STABLE

commit 877d9f8430b3993a2b651b8e14f088262d247a47
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 13:00:23 +0800
Tag:    v2.2.2

Merge branch '22_MDL-30723_fixing_several_english_typos' of git://github.com/gerrywastaken/moodle into MOODLE_22_STABLE

commit a87151d552b649f15e866ebdf8c0c75f6bc06d8e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 12:52:36 +0800
Tag:    v2.2.2

Merge branch 'm22_MDL-31085' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit f7562f72fbd2deca46910cd91193659521fefd27
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 12:34:39 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-25185-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit 38d0571f239c36fcd6d4cbb261f6aff4d3ccee0f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 12:17:29 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-31396-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit ff60281e4fc4e2dea2787df026a2d81cd5d16b88
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 12:02:32 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-31463-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit 8b927cfb8bc15e6291bcf7e6749723233f2093b4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 10:30:13 +0800
Tag:    v2.2.2

Merge branch 'wip-mdl-31576-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 5eb8ad61291b4be4f3e56a682719f0f374a5368d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 10:26:21 +0800
Tag:    v2.2.2

Merge branch 'MDL-31554_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 834214386243d2e08dad46692caae65ea0f1a433
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 09:36:14 +0800
Tag:    v2.2.2

Merge branch 'MDL-25883-22' of https://github.com/mackensen/moodle into MOODLE_22_STABLE

commit 887ec885b1d957e7d82908927a47284b190e6969
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Jan 2012 10:29:22 +0800
Tag:    v2.2.2

Merge branch 'w04_MDL-30509_m22_slowcohort' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit d0c82a5609d1a74e87d9d26035d022d02b63448c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Jan 2012 11:28:38 +0800
Tag:    v2.2.2

Merge branch 'MDL-31205_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 11942210a24e2086cf9e6cd55f2120d231d6a1ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Jan 2012 11:07:00 +0800
Tag:    v2.2.2

Merge branch 'MDL-31189_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit a67a3a8eecfe7ac6b5054b969e4380aacb98838d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Jan 2012 11:03:02 +0800
Tag:    v2.2.2

Merge branch 'MDL-31231_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit 6f421476a92608d90aa867dc0cbad10a0d016441
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jan 2012 15:37:48 +0800
Tag:    v2.2.2

Merge branch 'w04_MDL-31177_m22_odsexport' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 3c6d27b44bdeced759752a1b4753bafd8129f291
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jan 2012 15:15:52 +0800
Tag:    v2.2.2

Merge branch 'w04_MDL-31178_m22_enrolledws' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit f536a092d4bc4944f716f95eb6a9c21fa060c48b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jan 2012 14:45:50 +0800
Tag:    v2.2.2

Merge branch 'w04_MDL-31182_m22_messprefs' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit d5d5ae432cd1f339c5a580ee3331aa100c7a152f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jan 2012 14:31:48 +0800
Tag:    v2.2.2

Merge branch 'w04_MDL-31186_m22_extprofiles' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit cd5189e2661345e209396b21ad4fc787fdb2573a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jan 2012 11:48:25 +0800
Tag:    v2.2.2

Merge branch 'MDL-31077-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit c95efa393622d9ef7eadc6a66796f6d7bfa069d2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jan 2012 11:25:42 +0800
Tag:    v2.2.2

Merge branch 'MDL-31329_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE

commit 1c1b04c99409313f6704985e01d0a8190cb7457a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 16:59:27 +0800
Tag:    v2.2.2

Merge branch 'MDL-31095_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 8a9edd6dba26ac60973a93b1082d91ce7bab398f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 16:41:24 +0800
Tag:    v2.2.2

Merge branch 'MDL-31135_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 282dcd3c0329a77154bdbd28ea6b3d84d4dc5f0b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 16:27:38 +0800
Tag:    v2.2.2

Merge branch 'MDL-31102_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit d5c88f9333a675dd0f534d705057e0c21cd3f205
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 16:17:09 +0800
Tag:    v2.2.2

Merge remote-tracking branch 'skodak/w03_MDL-27165_m22_confirmed' into MOODLE_22_STABLE

commit 199ba4286b98981a63e01baef44b4be831184d7c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 15:11:07 +0800
Tag:    v2.2.2

Merge remote-tracking branch 'skodak/w03_MDL-29102_m22_autogrouping' into MOODLE_22_STABLE

commit f0987e98ad51035b91230d97a7ee69adcf3d9da5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 15:01:09 +0800
Tag:    v2.2.2

Merge remote-tracking branch 'skodak/w03_MDL-30891_m22_repository' into MOODLE_22_STABLE

commit 735d8ce2ce959557a9a324f6810185154925d1f0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 14:56:06 +0800
Tag:    v2.2.2

Merge remote-tracking branch 'skodak/w03_MDL-30958_m22_yuissl' into MOODLE_22_STABLE

commit 43812bf883f4b09f838092ddc9601be029d1bb09
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 14:49:28 +0800
Tag:    v2.2.2

Merge remote-tracking branch 'skodak/w03_MDL-31011_m22_loglinks' into MOODLE_22_STABLE

commit 6f960202e775a5c7bdcddb2294eb0a3a4671c1a3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 14:38:36 +0800
Tag:    v2.2.2

Merge remote-tracking branch 'skodak/w03_MDL-31035_m22_identitynotice' into MOODLE_22_STABLE

commit ff65ab25c24410e90bf05ce969b21292451648dd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 14:34:58 +0800
Tag:    v2.2.2

Merge remote-tracking branch 'skodak/w03_MDL-31117_m22_grouptodo' into MOODLE_22_STABLE

commit ac0d9c6411cbcce5075d41124082a23107e56597
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 14:33:01 +0800
Tag:    v2.2.2

Merge remote-tracking branch 'skodak/w03_MDL-31109_m22_maintenance' into MOODLE_22_STABLE

commit 1480ead173f1bb9ba15ee1655eaae12e7c1c8d55
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 12:00:12 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-31060-MOODLE_22_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_22_STABLE

commit 2d48474f2a6fd2c46d5c200f254a41add16e221b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 11:48:50 +0800
Tag:    v2.2.2

Merge branch 'MDL-31130_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 6bf567100abbabff345a68df5643161fafb67fb9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 10:59:41 +0800
Tag:    v2.2.2

Merge branch 'MDL-31040-MOODLE_22_STABLE-3' of git://git.luns.net.uk/moodle into MOODLE_22_STABLE

commit 859624f26c14da6b1ca286c0266ebe9d8759f2de
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jan 2012 09:30:22 +0800
Tag:    v2.2.2

Merge branch 'MDL-24394_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 10c3c6d49cb0f56b637984fffb0f7e4a122e72a1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jan 2012 09:26:36 +0800
Tag:    v2.2.2

Merge branch 'MDL-31019_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit da744e0065cfe21c4f283a7b3080dd3888edb202
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jan 2012 11:12:38 +0800
Tag:    v2.2.2

Merge branch 'w02_MDL-31005_m22_contextlevelname' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 5dff4c565fe598358f640e127639bec88148377a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jan 2012 09:03:00 +0800
Tag:    v2.2.2

Merge branch 'w02_MDL-30717_m22_usercreated' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 995294dfa37a42fa237e8e08a86e6a1a2e5cb23e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jan 2012 08:48:37 +0800
Tag:    v2.2.2

Merge branch 'w02_MDL-30928_m22_deletetimes' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit cef1e7f444b47cc1b3924868a765368691456f82
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jan 2012 08:02:21 +0800
Tag:    v2.2.2

Merge branch 'w02_MDL-30969_m22_suspendedcsv' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit ade2e5955ea78b1d9941532a222068cb79814135
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jan 2012 07:00:22 +0800
Tag:    v2.2.2

Merge branch 'MDL-30652_m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit ffd621215212088b6f70a99e5466c84a7bef69d4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 05 Jan 2012 06:17:13 +0800
Tag:    v2.2.1

Merge branch 'MDL-31017_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE

commit cd735560d34042aeba31b3f2d468ab5228b8bb40
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 11:35:26 +0800
Tag:    v2.2.1

Merge branch 'w52_MDL-30786_m22_todelete' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 1243bf814b7fb121c8767e7d59f9b94dcf9f254b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 06:25:50 +0800
Tag:    v2.2.1

Merge branch 'MDL-30802_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit e972cdc5adf7cac492d4b426c746b4e20a31be27
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 06:23:00 +0800
Tag:    v2.2.1

Merge branch 'MDL-30766_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit dc8d309c883d9ac656ab50bcf6678a7160d41d78
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 06:14:10 +0800
Tag:    v2.2.1

Merge branch 'MDL-30168_tim2_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 860848dca8974b023a7a43ac8437eb30cf2d5ee9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 06:12:01 +0800
Tag:    v2.2.1

Merge branch 'MDL-27200_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 7f7d9ce6e88493113b264350f2ef79f51358bb8f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 04:57:14 +0800
Tag:    v2.2.1

Merge branch 'MDL-13572_validate_email_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit e0c00395b7c18b9a30f92c751a5072b0e843b8c5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 22 Dec 2011 06:44:34 +0800
Tag:    v2.2.1

Merge branch 'wip-MDL-18128-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit 965344c08f273ffd3b286d6f965f554fb7da10e9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 22 Dec 2011 06:21:08 +0800
Tag:    v2.2.1

Merge branch 'MDL-30639_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit 6ff99dde45e9d9153989d5d63ae822148dc21523
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Dec 2011 10:00:41 +0800
Tag:    v2.2.1

Merge branch 'MDL-29239_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit db65026449cf7e443303d4b0190fdcf98dfaaafa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Dec 2011 09:30:27 +0800
Tag:    v2.2.1

Merge branch 'MDL-30704_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 0cba7c0408f54453c61170cc1831291b22491038
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 09:15:43 +0800
Tag:    v2.2.1

Merge branch 'MDL-30764-m22' of git://github.com/sammarshallou/moodle into MOODLE_22_STABLE

commit 9f83ba0887bd0ed0cc7ea9bd86e0eed9a743cfe4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 08:34:53 +0800
Tag:    v2.2.1

Merge branch 'MDL-30760_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 6005434b55c2ec09da8644a8601cf8ff9086d39c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 08:21:11 +0800
Tag:    v2.2.1

Merge branch 'MDL-30646_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit a8fb78b14245885a4394297ccabd92f2f71f7d37
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 08:16:20 +0800
Tag:    v2.2.1

Merge branch 'MDL-29846_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit b3af6c110ae016403a809c9f2d02e14c3f2bb084
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 07:08:09 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-30787_m22_coursemodedit' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 4e77491aff2791e7817a3d4e535f41a211c4956b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 05:42:45 +0800
Tag:    v2.2.1

Merge branch 'wip-MDL-28948-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit 1f3933bee6010d5b2f8a2e75423435bef59fd928
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 05:09:27 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-30765_m22_context' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit e7af814b0d36c64c889057f82a0d7208fe634490
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 05:03:59 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-30697_m22_roleslink' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 415be0ff9410d5a6fe8c30685bdd998857581b4e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 11:26:01 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-30789_m22_enrolupdatestatus' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit d613d7d78e5f50ca49b134573707624c426f4347
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 10:05:42 +0800
Tag:    v2.2.1

Merge branch 'MDL-37049_22' of git://github.com/jamiepratt/moodle into MOODLE_22_STABLE

commit 7c19940ca6843bf004e79f47b6901dd99716d074
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 09:14:55 +0800
Tag:    v2.2.1

Merge branch 'MDL-30683_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit ead158db7e96b67edde692262c3d57cd35a4ac76
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 07:23:36 +0800
Tag:    v2.2.1

Merge branch 'MDL-29176_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 3bcb2c1dff99a0869b24e16bb35528c3a381d5e8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 06:52:32 +0800
Tag:    v2.2.1

Merge branch 'MDL-30734_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 265dbb3a54ae80744bef3de28b1d0b7b4df5a04e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 06:30:42 +0800
Tag:    v2.2.1

Merge branch 'MDL-30742_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 2253ea25926d0093fde9f6d45fa6dc071cf90ea9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 05:53:57 +0800
Tag:    v2.2.1

Merge branch 'MDL-30744_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 5ff8144cc8ad3e8c7a025617310e8ea674c64656
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 04:28:10 +0800
Tag:    v2.2.1

Merge branch 'MDL-30758_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 83688ab542c67409f66d4196fb3b33779986733e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Dec 2011 12:17:29 +0800
Tag:    v2.2.1

Merge branch 'MDL-27183_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit d4b584c5f6cd739a13cdcacf6231d83947bf8129
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Dec 2011 09:25:17 +0800
Tag:    v2.2.1

Merge branch 'MDL-30463_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit 2f24a39b5ba86b7f953c988bc541dc59e6d8cb47
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Dec 2011 09:08:21 +0800
Tag:    v2.2.1

Merge branch 'MDL-30140-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit b3463f416c72287dd11c32f7ea5de05f5613c968
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 06:20:04 +0800
Tag:    v2.2.1

Merge branch 'MDL-30677_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit fc97bb98637f736728c549b2fdcc8f75994a39a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 06:15:08 +0800
Tag:    v2.2.1

Merge branch 'MDL-30532_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 8c495ea4ee66d1c43dae1766386d3a3877658ccb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 06:11:21 +0800
Tag:    v2.2.1

Merge branch 'MDL-30498a_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit bb0ece5a0c411828624dd47e810c43a247e57236
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 05:26:31 +0800
Tag:    v2.2.1

Merge branch 'MDL-27143_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit e79c09855ca853fab61d88b3f8d2a71e1fc8411b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 05:17:56 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-30621_m22_protectdir' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 860f7f919526880f42541e8d19127ab396a01da2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 12:59:24 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-29117_m22_enrolnewcourse' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit a3a3186770787fca49403a4b152ca3868be22e37
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 12:41:00 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-30292_m22_health' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 424f91c056bf4d57770f601174f4a07aef458740
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 12:37:39 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-30364_m22_report' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 653599b3a4918f699bc4c3ddbd6ab3eebdd1c9f1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 12:14:58 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-30588_m22_switchrole' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit ba9489ce912fb4b8fcc463aa43eefa6a5762210e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 11:37:03 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-30659_m22_yuidebug' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 6aabb69f9e593aa3e1c18ad9379f04dadb828058
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 11:10:19 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-30687_m22_ldapnewcourse' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 02af5654f2cb15105d79fc1bbe9c2be1ca500951
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 10:13:01 +0800
Tag:    v2.2.1

Merge branch 'MDL-29942-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit 4e8da675ac5ae0761aff112a7dcd9663be75f06c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 09:56:40 +0800
Tag:    v2.2.1

Merge branch 'MDL-28180_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE

commit d3054582d5738a6d76ea357f49b396562e69dd3a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 08:57:40 +0800
Tag:    v2.2.1

Merge branch 'MDL-30198-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit e0745be16b7a684c257a34ccd7bed187ef57ecb0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 09 Dec 2011 06:43:41 +0800
Tag:    v2.2.1

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

commit 78baf38ea4d9de59157a9a57de93c466bf9b5de2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Dec 2011 11:05:08 +0800
Tag:    v2.2.1

Merge branch 'MDL-30518' of git://github.com/mackensen/moodle into MOODLE_22_STABLE

commit a33d85b3744b55ca085c75e3dcbd2b650cccb7a5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Dec 2011 08:50:03 +0800
Tag:    v2.2.1

Merge branch 'w50_MDL-30623_m22_guest' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit b1d4c42ad698b45700b2cc6e1d830b91d3913b6f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Dec 2011 05:22:58 +0800
Tag:    v2.2.1

Merge branch 'MDL-28282-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 7f96df6222e9fb1500843beafdffee410e5f96c2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Dec 2011 05:19:22 +0800
Tag:    v2.2.1

Merge branch 'MDL-28588-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 6416c6c25b56427c1157c21f5d61e04d663aa83f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 12:14:52 +0800
Tag:    v2.2.0-rc1

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

commit 7bebeb2a29c58a2c5c1a3ab4b92b4e57e5f9f2b0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 10:48:20 +0800
Tag:    v2.2.0-rc1

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

commit bba1338a60c1306fb3dd85fbca78d0d9c4ec4244
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 09:43:39 +0800
Tag:    v2.2.0-rc1

Merged branch 'MDL-30459' of git://github.com/mouneyrac/moodle.git with whitespace fixes

commit 63a07688884ffc890a86cdfbc37eb9d4a6cb253e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 09:16:19 +0800
Tag:    v2.2.0-rc1

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

commit c3f185949fd8481e0f1a41fec83c2c77fecb7c8e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 07:44:09 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30526' of git://git.luns.net.uk/moodle

commit e8c3f32f83b7672cc332c4970bae25d5a058fc46
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 07:29:19 +0800
Tag:    v2.2.0-rc1

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

commit c9c7b8fb0b9e52bf6a9c4deefb3c2ec9c94b1f7d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 07:15:29 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30453-exassessment-link' of git://github.com/mudrd8mz/moodle

commit fa6765cf9c8a07fd2c6ddbbe7775318e1b03fb7f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 06:48:55 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30271-switch-role-workshop' of git://github.com/mudrd8mz/moodle

commit 0a9b7c2b6d781651f5bd232360c760ba984a9766
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Nov 2011 08:04:37 +0800
Tag:    v2.2.0-rc1

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

commit 4117b4fcd8fd46ca1000d107722118c395f9c50b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Nov 2011 08:02:15 +0800
Tag:    v2.2.0-rc1

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

commit 0c0d5011446f4e6fd13b00ba0c43eabed511dec4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Nov 2011 06:49:40 +0800
Tag:    v2.2.0-rc1

Merge commit 'FETCH_HEAd'

commit 3ddbd75accae05cfbd460ffd168e966a05414015
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Nov 2011 06:05:46 +0800
Tag:    v2.2.0-rc1

Merged branch 'MDL-30505' of git://github.com/lazydaisy/moodle.git with conflict resolution

commit fb056a811ecd0179e75d1368079cc95526589848
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Nov 2011 11:56:29 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30302-master-2' of git://git.luns.net.uk/moodle

commit 9ac82391a27bbd170435c3e7a88b793f8a215463
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Nov 2011 11:52:50 +0800
Tag:    v2.2.0-rc1

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

commit 925ae958241e34192bf488a8bea53f05ab44fe92
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Nov 2011 11:46:47 +0800
Tag:    v2.2.0-rc1

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

commit e343ff6a5d48b660002502256a27264d9e053a2c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Nov 2011 11:28:24 +0800
Tag:    v2.2.0-rc1

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

commit e68fa2500aaae1c25ce7649726f3e0c5e2a6def5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Nov 2011 10:16:27 +0800
Tag:    v2.2.0-rc1

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

commit bada16d35cf4a4e9498c545930c3886af53345f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Nov 2011 08:51:25 +0800
Tag:    v2.2.0-rc1

Merged branch 'wip-MDL-30361-master-rtlpatches' of git://github.com/nadavkav/moodle.git with changes

commit ac386aa92569e52d30d633e59024b5f658a4e4a3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Nov 2011 13:54:49 +0800
Tag:    v2.2.0-rc1

Merge branch 'w48_MDL-30448_m22_urlpar' of git://github.com/skodak/moodle

commit beb684ba11ea0b02d49df53e51dd0adf18bd3792
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Nov 2011 13:21:39 +0800
Tag:    v2.2.0-rc1

Merge branch 'w48_MDL-30457_m22_deluserspictures' of git://github.com/skodak/moodle

commit 5c0b8ea3f152a4d9e6b6eaef9e2d2586bdd114a5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Nov 2011 13:13:27 +0800
Tag:    v2.2.0-rc1

Merge branch 'w48_MDL-30467_m22_delusers' of git://github.com/skodak/moodle

commit 77da06ceb4285c8534428d0e5c4480653b0cb21f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 25 Nov 2011 08:13:06 +0800
Tag:    v2.2.0-rc1

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

commit d905b69e95d675e032f4f93ce6afe1f86cb254c2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 25 Nov 2011 06:53:24 +0800
Tag:    v2.2.0-rc1

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

commit 7355a8e4b7de6eb6caeb0d7871da89b77be2ce09
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 25 Nov 2011 06:29:33 +0800
Tag:    v2.2.0-rc1

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

commit b674092416c7c2cf0b56511a6554f634df0f581e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Nov 2011 11:52:08 +0800
Tag:    v2.2.0-rc1

Merge branch 'dev_MDL-29476_ws_participants_master' of git://github.com/dongsheng/moodle

commit b8a2a92773fc7a003b44708b9aabde6eb22f3992
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Nov 2011 09:11:23 +0800
Tag:    v2.2.0-rc1

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

commit ba54648b45b44f2f685d124dadddb714d35b523a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Nov 2011 08:54:26 +0800
Tag:    v2.2.0-rc1

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

commit f2d11739a8dea0ea19c32b8c82b41f18935ed347
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Nov 2011 07:41:24 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30393_2' of git://git.catalyst.net.nz/moodle-r2

commit b2d3e5cc493c382a1836f3f7c5c0c3b75d731756
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Nov 2011 07:17:14 +0800
Tag:    v2.2.0-rc1

Merge branch 'w46_MDL-30303_m22_mimeinfo' of git://github.com/skodak/moodle

commit 15415bf8e8682e618f32774496872d9de95a37f2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Nov 2011 05:57:38 +0800
Tag:    v2.2.0-rc1

Merge branch 'w46_MDL-30403_m22_upgradedocs' of git://github.com/skodak/moodle

commit b28de4b412c9cd37b12324749789dc97e4d6ca39
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Nov 2011 13:26:35 +0800
Tag:    v2.2.0-rc1

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

commit f5d0ac107758502255f165fd18f285c36cad48e4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Nov 2011 07:59:19 +0800
Tag:    v2.2.0-rc1

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

commit 495bcb06d14e453298d209a317ba7c60e235463b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Nov 2011 05:39:02 +0800
Tag:    v2.2.0-rc1

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

commit 919423fc6cf74ff4db96e67545296511a2f38fbe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Nov 2011 08:32:55 +0800
Tag:    v2.2.0-rc1

Merge branch 'w46_MDL-30228_m22_pdftestcopyright' of git://github.com/skodak/moodle

commit 28e6598dff156cf6edb2e675ab4f0cd6855e5c93
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Nov 2011 07:48:06 +0800
Tag:    v2.2.0-rc1

Merge branch 'w46_MDL-30294_m22_errorsinthemefiles' of git://github.com/skodak/moodle

commit 67c768dbe8a9e2dff95ddd010a9f1d25ec2e7c08
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Nov 2011 07:39:42 +0800
Tag:    v2.2.0-rc1

Merge branch 'w46_MDL-30308_m22_reqstrict' of git://github.com/skodak/moodle

commit 4f0596f874caa3a757eba951f4aea88afb377a78
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Nov 2011 07:23:32 +0800
Tag:    v2.2.0-rc1

Merge branch 'plagiarismbranch' of git://github.com/peterbulmer/moodle

commit 291029dfd546b934a844a9569f4155d47b8730bd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Nov 2011 07:01:45 +0800
Tag:    v2.2.0-rc1

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

commit 34e05996c189359c50d65ae68608887e7ef93d54
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Nov 2011 06:53:45 +0800
Tag:    v2.2.0-rc1

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

commit b8c117e1267b42ee7ef2098903d96c8067a4c209
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Nov 2011 06:48:47 +0800
Tag:    v2.2.0-rc1

Merge branch 'w46_MDL-30327_m22_blockconfig' of git://github.com/skodak/moodle

commit 7cdf3904a7c32478121429a8e9d5c894142c40f4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Nov 2011 05:28:32 +0800
Tag:    v2.2.0-rc1

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

commit b750c6b3884ea3ba33ffdd4040e44bf1fd8a20b8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 Nov 2011 09:53:38 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-24577-master-1' of git://git.luns.net.uk/moodle

commit 28ab9dbe98305c69dea8758afb7251076ec9479b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 Nov 2011 08:11:46 +0800
Tag:    v2.2.0-rc1

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

commit 1ae9aa2b8f2ccb5a696378736039a24a85fb9713
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Nov 2011 17:01:05 +0800
Tag:    v2.2.0-beta

Merged MDL-29108 Advanced grading

commit 364fe13b11b9a668ccb36f4bdb66679ba871fb83
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Nov 2011 12:49:47 +0800
Tag:    v2.2.0-beta

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

commit 6335838604b8b13cbc0a51e299079895ca405221
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Nov 2011 07:10:17 +0800
Tag:    v2.2.0-beta

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

commit 025d304ad3f162018fd5ef48a021dc6813cc5b11
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 11 Nov 2011 13:35:13 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-27622-master' of git://github.com/samhemelryk/moodle

commit e3dfd1a1d96c5f60822d6a13a23e8ffa430f4b1d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 Nov 2011 05:15:50 +0800
Tag:    v2.2.0-beta

Merged branch 'w44_MDL-29030_m22_reports' of git://github.com/skodak/moodle.git with conflict resolution

commit 7d99144e83125433bea233c475473d9fe9529fb8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 Nov 2011 04:41:38 +0800
Tag:    v2.2.0-beta

Merge branch 'w44_MDL-30150_m22_pagetypefrankenstyle' of git://github.com/skodak/moodle

commit ee16b8af347a6704e7b3fadbb456dd99b57c8b28
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Nov 2011 08:10:00 +0800
Tag:    v2.2.0-beta

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

commit 195ad02f4ab34d1665492a9c24c2d42cecb1c268
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Nov 2011 08:00:00 +0800
Tag:    v2.2.0-beta

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

commit 3e4fb0cf81b2f33aca5656d6aca99b9b565d94d2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Nov 2011 06:58:10 +0800
Tag:    v2.2.0-beta

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

commit daa1ed26cfe4d6f6760af1dfb8b5ba9d2216c61a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Nov 2011 05:57:54 +0800
Tag:    v2.2.0-beta

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

commit 68bcca4d04fa953581ba9e6183f465e2237ffdd5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Nov 2011 07:24:26 +0800
Tag:    v2.2.0-beta

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

commit a82a42b6c1bcd070c502e6a6470d5d3a3823d74f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Nov 2011 06:58:44 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29864-master-2' of git://git.luns.net.uk/moodle

commit 0abe89f7b4cf1ec5c028c3dd6b78b74641523607
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Nov 2011 06:41:31 +0800
Tag:    v2.2.0-beta

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

commit f94d606f1f2070725dd015a91ba6812045c96073
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 12:36:50 +0800
Tag:    v2.2.0-beta

Merge branch 'w43_MDL-29964_m22_fixenrolevents' of git://github.com/skodak/moodle

commit 5f3abf0a42808ad7890b4a2dac1f5dc5eba17067
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 11:52:02 +0800
Tag:    v2.2.0-beta

Merge branch 'w43_MDL-29980_m22_flowcss' of git://github.com/skodak/moodle

commit 6ab6630b8738ff85d87b7ab0801627c6e4510361
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 11:47:16 +0800
Tag:    v2.2.0-beta

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

commit bc454be746af8e7cb5b1ad066870646e648837ad
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 11:11:58 +0800
Tag:    v2.2.0-beta

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

commit c189b664aed0ecfed2660de01707479993124b09
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 10:56:55 +0800
Tag:    v2.2.0-beta

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

commit 5a866c36345e09ea01e4912852fd4a9bb3e28a75
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 04:38:24 +0800
Tag:    v2.2.0-beta

Merge branch 'w43_MDL-29925_m22_calendar' of git://github.com/skodak/moodle

commit 703912cd5ef20e053b5ed97d721351976ab2c798
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 13:02:03 +0800
Tag:    v2.2.0-beta

Merge branch 'w43_MDL-29883_m22_mp3player' of git://github.com/skodak/moodle

commit d0464f3875101c9b0bf5e379b578d7dc38029717
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 12:59:11 +0800
Tag:    v2.2.0-beta

Merge branch 'w43_MDL-29824_m22_enrolmax' of git://github.com/skodak/moodle

commit 0b49b6daa75325f0c7504c2b5e14bdda99afc03e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 12:28:57 +0800
Tag:    v2.2.0-beta

Merge branch 'w43_MDL-28720_m22_calendarreturn' of git://github.com/skodak/moodle

commit 5e255d5ad86a980411320ca5c63c4e96e278da27
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 12:18:13 +0800
Tag:    v2.2.0-beta

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

commit 243e3dd130adfdb0cd89349498c494403191de68
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 12:11:08 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29810' of git://github.com/bostelm/moodle

commit 1fe368530fda98210159d11c2781d50833af5c7f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 11:53:24 +0800
Tag:    v2.2.0-beta

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

commit 70f43a4789065b158860bc4a649ef74dca229514
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 10:19:31 +0800
Tag:    v2.2.0-beta

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

commit 01dc193786384ca54031397e5e481441fa4442a3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 09:56:06 +0800
Tag:    v2.2.0-beta

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

commit a6d832f022019e9abccad0d58041bef87d5f6bf6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 08:51:07 +0800
Tag:    v2.2.0-beta

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

commit cdf30a11a8ed7f117dd65939492a19fd4363aa18
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 08:06:10 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-30006-workshop-grades' of git://github.com/mudrd8mz/moodle

commit 81ad059658dd525ed65f92a1e64354cdcfdaac0c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 07:59:35 +0800
Tag:    v2.2.0-beta

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

commit 75dab90e3df85a1cafe2b7a52bccf7099b57d150
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 07:55:57 +0800
Tag:    v2.2.0-beta

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

commit ad7592f32bdabfd158d16d69d072987086fdc726
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 07:47:21 +0800
Tag:    v2.2.0-beta

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

commit 385f30f7a77a886a91d7f4394115ebd13b322c1f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 07:44:05 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29898-master-1' of git://git.luns.net.uk/moodle

commit 7b27861217bea48b796f9f39ce1b2ea0411b1f28
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 27 Oct 2011 07:57:21 +0800
Tag:    v2.2.0-beta

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

commit e6369d951c9b724a61003e95a0f5c8a5001ab6a2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Oct 2011 05:44:41 +0800
Tag:    v2.2.0-beta

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

commit 462a064cf08143dbf62ad4327209630f8b8776de
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Oct 2011 05:21:35 +0800
Tag:    v2.2.0-beta

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

commit 1c3bd9b3ff8278c4540122d7b6f980803b62bc31
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 11:47:20 +0800
Tag:    v2.2.0-beta

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

commit d040ea889319a657a5ffb9eac38ea957dfa9400c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 10:19:45 +0800
Tag:    v2.2.0-beta

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

commit 6327bf8f2badd558faf80b20705a733bcfa0d20f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 09:28:53 +0800
Tag:    v2.2.0-beta

Merge branch 'w42_MDL-29444_m22_iframe' of git://github.com/skodak/moodle

commit 44d10ad002096029a058e8b2b632621aa66d6d02
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 09:02:20 +0800
Tag:    v2.2.0-beta

Merge branch 'w42_MDL-29688_m22_enrol' of git://github.com/skodak/moodle

commit 9d9d8e17ebe41979a55460380cee75e1c3ea7d9b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 08:10:43 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29902' of git://git.luns.net.uk/moodle

commit 6f59dd1a8bc2f7c191e44b66df4d085c5d02ad62
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 07:25:28 +0800
Tag:    v2.2.0-beta

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

commit 9c99c3df4658ca682c752bd916747302283a8c66
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 06:49:25 +0800
Tag:    v2.2.0-beta

Merge branch 'w42_MDL-29862_m22_fullmeinit' of git://github.com/skodak/moodle

commit 2d9408446373fb6e9e7a2defb072bd9099036611
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 06:46:51 +0800
Tag:    v2.2.0-beta

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

commit c486d7f2d84d0fb9029c94d3e3e9706207dbb828
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 06:45:58 +0800
Tag:    v2.2.0-beta

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

commit b8b594843c14044d8efa4484300756e707f0d149
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 06:42:40 +0800
Tag:    v2.2.0-beta

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

commit f856216cb1b2699c18c654ed692afc14aae4c2bd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Oct 2011 09:31:34 +0800
Tag:    v2.2.0-beta

Merged branch 'MDL-28491' of git://github.com/timhunt/moodle.git with conflict resolution

commit 4f50a62635346d6883206a6ab057eda4c7bde321
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Oct 2011 06:38:26 +0800
Tag:    v2.2.0-beta

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

commit ff90023b006b1c55915027e92fc4d971e1a38b52
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 13:52:23 +0800
Tag:    v2.2.0-beta

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

commit 22ca670f88c1de351b0043e81141663eec208119
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 12:37:49 +0800
Tag:    v2.2.0-beta

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

commit 5f6de5dc6b3f558cf8db9cadd9b3384f20704688
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 12:31:52 +0800
Tag:    v2.2.0-beta

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

commit d97505d2a344df0934972521464cdd123a3dd047
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 12:28:32 +0800
Tag:    v2.2.0-beta

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

commit a6ec1940c841dbfad14a738ea7f7bbc3b9b15afd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 11:25:33 +0800
Tag:    v2.2.0-beta

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

commit f7e8e43f2d864767927f9b3ccc8792379579302d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 10:21:45 +0800
Tag:    v2.2.0-beta

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

commit b55853ff63c71722134245627cb10469a8423781
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 08:54:03 +0800
Tag:    v2.2.0-beta

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

commit 92fe97f922c2f03496b54f7f171ab4f1b9db1cd3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 08:18:30 +0800
Tag:    v2.2.0-beta

Merged branch 'MDL-29277' of git://github.com/mouneyrac/moodle.git with improvements

commit 629aa44873c4546ecab97d257434be14a3db0e53
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 06:07:25 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-19488_master_wip' of git://github.com/grabs/moodle

commit d87ef085986d1d5e7e6022b256eb9b41cb99be8b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Oct 2011 05:25:33 +0800
Tag:    v2.2.0-beta

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

commit 811cbdcfbf76bfb5c1467185e33ad728abe7a5c9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Oct 2011 05:15:46 +0800
Tag:    v2.2.0-beta

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

commit 1216ab39d1377eb6ec21897f0f1bedf3a0488c22
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 12:56:14 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-16553' of git://github.com/bostelm/moodle

commit 3070626a748245340f4942d7d84676116a76dd2c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 07:20:38 +0800
Tag:    v2.2.0-beta

Merge branch 'w40_MDL-29686_m2_yuicaching' of git://github.com/skodak/moodle

commit 77b93da537e86a7001c8f4d6e09172439bd936cf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 07:09:34 +0800
Tag:    v2.2.0-beta

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

commit 36a42c57d103856ea7fabd291137f540674b86f8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 07:03:39 +0800
Tag:    v2.2.0-beta

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

commit f915430855c73baeb2f117dfdab9dece2196a6f4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 06:24:44 +0800
Tag:    v2.2.0-beta

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

commit 0870a0689971395b31ce99c7208b9a72e21176b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Oct 2011 12:54:00 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29621_master_wip' of git://github.com/grabs/moodle

commit 2bbe5979cbe56de1deff2f86fcc550527a25105f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Oct 2011 11:21:16 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28725_wiki_section2' of git://github.com/andyjdavis/moodle

commit 66d216c574781db4c9043c4817272559cd7b9924
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Oct 2011 10:52:57 +0800
Tag:    v2.2.0-beta

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

commit 1bbe222d530378956a1c0701158a429250a9fdd3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 12:08:21 +0800
Tag:    v2.2.0-beta

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

commit 324e62047425c290372a73c73fdc69c5d43a37be
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 11:41:12 +0800
Tag:    v2.2.0-beta

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

commit 006debe5e4c8b98b8640819f59609c6b0f52724b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 10:09:17 +0800
Tag:    v2.2.0-beta

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

commit 2c66ceeaef935fdb98904ecdc1b9cc07be420b27
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 09:37:35 +0800
Tag:    v2.2.0-beta

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

commit 3a2abe2e6ebb0c7ff21f44e86f47c67f8882132c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 09:29:49 +0800
Tag:    v2.2.0-beta

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

commit 49ebdaf1da1299e8550fc8c2a22694842f97f294
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 09:24:38 +0800
Tag:    v2.2.0-beta

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

commit 9ea1b97fa424c4e5bfd307efcd8c2f9abb932955
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 09:01:48 +0800
Tag:    v2.2.0-beta

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

commit ef6380f0429d24f0d314592b991a1ecf132b1ab8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 08:29:26 +0800
Tag:    v2.2.0-beta

Merge commit 'FETCH_HEAd'

commit 1efd3fc8e73ac0db3a6ac35b5800d1a6dd8473d3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 08:23:01 +0800
Tag:    v2.2.0-beta

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

commit dcde0e9389391817ec4ec5be592f83be6d10fcc9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 07:49:39 +0800
Tag:    v2.2.0-beta

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

commit 9209bcfbb10047422e8ec9329b431e1c121578bc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 07:27:11 +0800
Tag:    v2.2.0-beta

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

commit e06ae159ff5147498db67d5101d6739f216825b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 07:24:40 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29612' of git://github.com/stronk7/moodle.git with typo cleanup

commit dc39771b01fac887afa47165a9ed9a28e6a8ccea
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 07:02:58 +0800
Tag:    v2.2.0-beta

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

commit 9afd0b3e2e67b4513535d7c39fa00115dd52691e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 06:51:30 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-27295' of git://git.luns.net.uk/moodle

commit f08d258cd4a3a0d2b4e07c8100b7d2abeb1e58ec
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Sep 2011 09:09:18 +0800
Tag:    v2.2.0-beta

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

commit 87eca3192f78993e9bbe2ccd241ae289cca4600d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Sep 2011 06:24:02 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28424' of git://github.com/timhunt/moodle.git with changes

commit 32da08a2e269118a47350fe256d263af83859373
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 09:03:54 +0800
Tag:    v2.2.0-beta

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

commit aa856c79994d0e82aa4126c825ef082284da929d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 08:53:17 +0800
Tag:    v2.2.0-beta

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

commit 98182d2bb6a9359a04bd51ef5a7bdb44e1b7b8d3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 08:50:36 +0800
Tag:    v2.2.0-beta

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

commit 663a12c32e1bb0659a8e87277c0d402878421782
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 08:47:41 +0800
Tag:    v2.2.0-beta

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

commit 6ef900d20bead28c4685c817fcd0a632c6a4dabc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 07:55:19 +0800
Tag:    v2.2.0-beta

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

commit 809dae3461f004cde6fafcc414c745163649d96c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 07:37:12 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29336-numerrors-mapping' of git://github.com/mudrd8mz/moodle

commit 0ebe6764e9666cbd5dd8732eef6ed1b10cd8e2ce
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 05:52:48 +0800
Tag:    v2.2.0-beta

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

commit fea98bd4c37b3641a417f5dbda6b126ef25930df
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 05:46:39 +0800
Tag:    v2.2.0-beta

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

commit 9d0fc907e8e01ec1bb3e865af1ae097b5ce70be8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 05:38:54 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29190_master_wip' of git://github.com/grabs/moodle

commit 609ad0da5bae152ee0a35fa3b2ed47574caa64ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Sep 2011 13:52:53 +0800
Tag:    v2.2.0-beta

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

commit 436cfb8bb76527b1e5b0683d2a09d6baedac7bad
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Sep 2011 08:14:13 +0800
Tag:    v2.2.0-beta

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

commit 7d6e26b49b8144c92d8ecdd1328bb88a5444e0f6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Sep 2011 07:58:04 +0800
Tag:    v2.2.0-beta

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

commit 4cc14ab11edd7319896cba4f49a1128a33243563
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 15:19:42 +0800
Tag:    v2.2.0-beta

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

commit 0910764ff3a209df2b06029a34d9c0128bba965d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 14:36:38 +0800
Tag:    v2.2.0-beta

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

commit 931f89cc13e16088a760ee0eb7d9d554ded5a4b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 13:01:00 +0800
Tag:    v2.2.0-beta

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

commit 668dae632aa64c92720e3b43daf5ab9f8dc82f7f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 10:26:58 +0800
Tag:    v2.2.0-beta

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

commit cb2c93c8db2ce107a8f093c8b1626b8fceb3fcb8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 09:32:37 +0800
Tag:    v2.2.0-beta

Merge branch 'w37_MDL-29406_m22_configdelete' of git://github.com/skodak/moodle

commit 7e0b7fe7cf9ad040c6adc937f34561cab10cfaf8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 07:56:34 +0800
Tag:    v2.2.0-beta

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

commit 76ecaa10749fb42c4034630d1519d7adf4118526
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 07:40:48 +0800
Tag:    v2.2.0-beta

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

commit 2b834a1d06606a43b548a1f4ff3370cbd4650598
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 07:15:04 +0800
Tag:    v2.2.0-beta

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

commit 4bc844f770a13b41c1e81bb3311a73d46424ef47
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Sep 2011 11:34:03 +0800
Tag:    v2.2.0-beta

Merged branch '28595_m22_installcontinue' of git://github.com/skodak/moodle with changes

commit 62b214d9a6f036c620cbed4dccecc804f3419376
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Sep 2011 08:45:34 +0800
Tag:    v2.2.0-beta

Merge branch 'w36_MDL-29014_m22_str' of git://github.com/skodak/moodle

commit 32ec60d142b21967464731eb5456e192a29ce20a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 16:18:27 +0800
Tag:    v2.2.0-beta

Merged branch 'MDL-22232_easier_turn_off_notifications' from git://github.com/andyjdavis/moodle.git with conflict resolution

commit 9f768d6e5fa1d3d8c0e3a4cd141616d487fb46c8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 15:48:33 +0800
Tag:    v2.2.0-beta

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

commit f8adfe6cc0be02bc469918b87a142c11581b241b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 14:26:09 +0800
Tag:    v2.2.0-beta

Merge branch 'w36_MDL-28701_m22_tempcachedir' of git://github.com/skodak/moodle

commit eb3d2faaa1fa85741b50f48540c6c21c0baba68c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 13:48:09 +0800
Tag:    v2.2.0-beta

Merge branch 'w36_MDL-29025_m22_verboseauthdb' of git://github.com/skodak/moodle

commit 16ff2aee7dbc4799e534277fde524835ac420676
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 13:24:49 +0800
Tag:    v2.2.0-beta

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

commit 5da0e7fc03d8ef0e9be6c453dfe88a51a6d57af0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 13:08:27 +0800
Tag:    v2.2.0-beta

Merge branch 'w36_MDL-29131_m22_recentsep' of git://github.com/skodak/moodle

commit 5b4404f615d0f30929bcaf625ab76186fd696eab
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 12:52:36 +0800
Tag:    v2.2.0-beta

Merge branch 'w36_MDL-29175_m22_clozearray' of git://github.com/skodak/moodle

commit 8d6540ffd17a5f6098ec80c0d7e9385103c6d972
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 12:30:44 +0800
Tag:    v2.2.0-beta

Merge branch 'w36_MDL-29257_m22_uniqid' of git://github.com/skodak/moodle

commit b13dbc43d763c37a7458fe71793f17e88deeb179
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 11:30:15 +0800
Tag:    v2.2.0-beta

Merge branch 'w36_MDL-29306_m22_dbenrolroles' of git://github.com/skodak/moodle

commit 8b5bab6f91b42ab537503bafe27eeb7ddac7ef63
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 11:17:08 +0800
Tag:    v2.2.0-beta

Merge branch 'w36_MDL-29292_m22_featuretypo' of git://github.com/skodak/moodle

commit 633a5edd515f6d80e61bbef0e3cb57bd8333a84b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 10:38:45 +0800
Tag:    v2.2.0-beta

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

commit 342e97ee9c23e632b78223a9ee6a26463d47c200
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 09:42:28 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-15377-master' of git://github.com/raymanuk/moodle

commit 0eac94dfc7991ff2fa2c84d8d04d735f906fbe24
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 09:19:12 +0800
Tag:    v2.2.0-beta

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

commit 014d3c1f8d1de8d74f541dd637c12c9cd4e82161
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 09:09:30 +0800
Tag:    v2.2.0-beta

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

commit e824388a1c34085a63cac6ef617c403186cca8cd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Sep 2011 15:23:07 +0800
Tag:    v2.2.0-beta

Merge branch 'w35_MDL-29233_m22_usersel' of git://github.com/skodak/moodle

commit ae4d8567b4b74b85b25f72141e773bbbf3e79a8a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Sep 2011 12:08:03 +0800
Tag:    v2.2.0-beta

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

commit 0d966d5bfe146fd6a88997d8801e2fd93119467d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Sep 2011 12:03:04 +0800
Tag:    v2.2.0-beta

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

commit 15f3ba7e78bf0ee97cdc16995f74c9f1920c5914
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Sep 2011 09:41:04 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29072' of git://github.com/bostelm/moodle

commit 3dc1b595ef8cc16fd505088d05fcac1b0a65eb6b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Sep 2011 09:36:35 +0800
Tag:    v2.2.0-beta

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

commit 057c2f8d06d51e1c0bde7195c88127cf7de8a48d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Sep 2011 07:12:10 +0800
Tag:    v2.2.0-beta

Merge branch 's13_MDL-29170_risklevel_master' of git://github.com/dongsheng/moodle

commit 239ed133f12bb6e7aad1cfdd7df1c93dc88f127a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Aug 2011 07:03:38 +0800
Tag:    v2.2.0-beta

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

commit 1e31393dba01307b35c4c5ecb9a4269aa1889550
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Aug 2011 09:58:05 +0800
Tag:    v2.2.0-beta

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

commit e57bbf55abe82347eddc36c273d9587d340c8d2d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Aug 2011 09:05:00 +0800
Tag:    v2.2.0-beta

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

commit c4b06ddd7549d9a273bb54dc4be1a5a247b5875b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Aug 2011 08:53:51 +0800
Tag:    v2.2.0-beta

Merge branch 'dev_MDL-27289_boxnet_master' of git://github.com/dongsheng/moodle

commit c873eb4a90f21cf6b8bd897724d48738539bc32a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Aug 2011 08:23:27 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29135-mnet-login' of git://github.com/mudrd8mz/moodle

commit 1924a86afaeca2ea4a60a563250c1a32e6579c03
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Aug 2011 08:13:40 +0800
Tag:    v2.2.0-beta

Merged branch 'MDL-28460_master' of git://github.com/kordan/moodle.git with conflict resolution

commit 95d0c74474e7112d7e0cf9720df1bc3de956714b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Aug 2011 07:11:10 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-6397_database_rss_label' of git://github.com/andyjdavis/moodle

commit 92636dfb5a77be259e75a92ef8cfd8ef84b67e7c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Aug 2011 14:04:22 +0800
Tag:    v2.2.0-beta

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

commit 751a6d3c29a9b8276155253a831fca4c0648ef17
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Aug 2011 13:39:32 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL_25417' of git://git.luns.net.uk/moodle

commit 01352e33ccf22779dcc8dd9c405bc643a9052ae9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 15:05:56 +0800
Tag:    v2.2.0-beta

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

commit e97584bcf1075485fa043d28830fc97cc6f17001
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 14:22:51 +0800
Tag:    v2.2.0-beta

Merge branch 'mdl-28517' of git://github.com/colchambers/moodle

commit 0d38abcf38a09e8bc28ac0b7cac700589e75aad4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 13:58:10 +0800
Tag:    v2.2.0-beta

Merged branch 'MDL-28575_master' of git://github.com/kordan/moodle.git with conflict resolution

commit 9e4b5b45a497cc251a27febda31599d640eb35ef
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 13:43:42 +0800
Tag:    v2.2.0-beta

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

commit a3ff929807af559c20bcacd3a686ba688b86736b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 11:18:14 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28406_block_duplicate' of git://github.com/andyjdavis/moodle

commit 16c009c5bf8dd53aa8628d09e6f8de33854da6b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 11:06:54 +0800
Tag:    v2.2.0-beta

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

commit 067b8a555627240995029bdaf4c2be0c34bee4ac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 11:04:19 +0800
Tag:    v2.2.0-beta

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

commit 9d85b62c42d16a27b4500e054fbcf934080da811
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 11:00:38 +0800
Tag:    v2.2.0-beta

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

commit 2f86bcfffa03f68dccef26a07fde5de2779f92af
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:57:11 +0800
Tag:    v2.2.0-beta

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

commit b1251c9008d422878e53174c9fcac002e1690dd6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:46:41 +0800
Tag:    v2.2.0-beta

Merge branch 'w31_MDL-27586_m22_browser' of git://github.com/skodak/moodle

commit cb09753feb3bf141003f9baaf1289ab6750ee90e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:26:20 +0800
Tag:    v2.2.0-beta

Merge branch 'w31_MDL-27685_m22_pglike' of git://github.com/skodak/moodle

commit 9be161c678f1c80ebcee2744fad6721c0f1e5a4a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:20:15 +0800
Tag:    v2.2.0-beta

Merge branch 'w31_MDL-28382_m22_iis' of git://github.com/skodak/moodle

commit 7d85a4e2269736010afb46208836f1ad1e7e7f99
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:16:23 +0800
Tag:    v2.2.0-beta

Merged branch 'w31-MDL-28412_m22_iconv' of git://github.com/skodak/moodle.git with english string improvements

commit 3b8502658f5dac34b716352a920a3d010d6948f3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:09:31 +0800
Tag:    v2.2.0-beta

Merge branch 'w31_MDL-28450_m22_defgroup' of git://github.com/skodak/moodle

commit 406bf830cde1d3f0c2d5081c301595f436ad9e1a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:06:06 +0800
Tag:    v2.2.0-beta

Merge branch 'w31_MDL-28468_m22_cohortassign' of git://github.com/skodak/moodle

commit 7d405fe7c8c8ad411a53e553adbd463f6c6636d7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 09:59:42 +0800
Tag:    v2.2.0-beta

Merge branch 'w31_MDL-28473_m22_blocksupgrade' of git://github.com/skodak/moodle

commit 639ab4d5c58f4b73c4102c56de10627be9b75ca9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 09:57:11 +0800
Tag:    v2.2.0-beta

Merge branch 'w31_MDL-28622_m22_userdel' of git://github.com/skodak/moodle

commit c357b5c6e0e3c203351d18124ee541a06281f7a1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 09:50:33 +0800
Tag:    v2.2.0-beta

Merge branch 'w31_MDL-28630_m22_cookie' of git://github.com/skodak/moodle

commit 948ef5d07aa3c89a34a65173eaf399324149ec60
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 03 Aug 2011 15:03:30 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28520' of git://git.luns.net.uk/moodle

commit 44506b87dc427eadb0456dd603574bd82ced0888
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 17:55:21 +0800
Tag:    v2.2.0-beta

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

commit 58e67f7f1a36d5a0bc6292f19b1f23ae71efaec3
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 17:48:02 +0800
Tag:    v2.2.0-beta

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

commit 87573744e6e26d9c9b3e95c629cd2fe27f2fa16d
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 17:14:04 +0800
Tag:    v2.2.0-beta

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

commit 1eaeb5d89ed195e1110cd3d318a2cf3bdb6948ab
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 17:06:56 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28515' of git://git.luns.net.uk/moodle

commit 6b50af32d66ae1e6ca2d8f6086cb6f23a47eaf1b
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 16:59:55 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28340_advanced_search_other_users' of git://github.com/andyjdavis/moodle

commit a338b06243e7da8f4edde537a207bc7af354e8a9
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 16:50:58 +0800
Tag:    v2.2.0-beta

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

commit fef0f0e79399ceae0475a0b695bfbef45e2fb301
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 16:46:39 +0800
Tag:    v2.2.0-beta

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

commit 8a5d0e95b3311f94007ba72702a5f78ef10528af
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 16:19:08 +0800
Tag:    v2.2.0-beta

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

commit 5867cf50475886e250cc25cf00acc03b40671afa
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 14:08:31 +0800
Tag:    v2.2.0-beta

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

commit 223b96e0fd8f3f50510146a56af7477fac8879f0
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 13:42:44 +0800
Tag:    v2.2.0-beta

Merge branch 's11_MDL-28284_filepicker_module_master' of git://github.com/dongsheng/moodle

commit 16321a2bef3827187425ac709799609160590d73
Author: unknown <SamandJen1@.(none)>
Date:   Tue, 02 Aug 2011 13:25:44 +0800
Tag:    v2.2.0-beta

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

commit dee43df740e057a419382fd477882f1943173270
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 12:22:29 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28487-typo' of git://github.com/mudrd8mz/moodle

commit 2f783d93d5ca0bbed5d9bda012a90f1674917d1b
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 12:02:52 +0800
Tag:    v2.2.0-beta

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

commit e832dfec60694d86ad369d51c3c452876bf8d814
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 29 Jul 2011 10:13:57 +0800
Tag:    v2.2.0-beta

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit 9e4d53c7e8d6d2fc70e882ac9b07f9a83d1b096e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 15:37:05 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-28441_m22_scromreport' of git://github.com/skodak/moodle

commit 39c621f63b5b7ff4a4a243c34a7828b310005cda
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 15:14:12 +0800
Tag:    v2.2.0-beta

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

commit 6c193bff68901b05cdfea5a426bbc02824f1aa24
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 11:18:21 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-22584_m22_monsterpaths' of git://github.com/skodak/moodle

commit 00d8d33cdc68e157fb36883634bec3116cb86c41
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 11:08:26 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-25699_m22_installcss' of git://github.com/skodak/moodle

commit 9192b4537c7994d81b018f507a2709a13f68da2f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 11:03:34 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-27464_m22_continue' of git://github.com/skodak/moodle

commit 7fe0effd0036ac7277c58984d454075bc5be4228
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:59:08 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-27653_m22_usercasting' of git://github.com/skodak/moodle

commit b039eeb82bf507ada9c4718fed9931cebd095fa1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:54:25 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-27796_m22_httphost' of git://github.com/skodak/moodle

commit 0e7f782eb4242d68a94691616a187c06c24dd792
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:45:20 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-27994_m22_creatorcaps' of git://github.com/skodak/moodle

commit 1092bd6db43b21f321541fbaa9c2ec8f6bf0e1c4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:39:11 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-28145_m22_renderer' of git://github.com/skodak/moodle

commit e826ef51b2dd94e9fcf456c8dd70dfaaf04e1dc2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:36:36 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-28182_m22_userdel' of git://github.com/skodak/moodle

commit 7443fae6a5bc73dd3f6c870a475cddf326f4a8c4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:29:42 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-28337_m22_urlparams' of git://github.com/skodak/moodle

commit 1f70ee662ef5bd02763f6d548d82a48dfea167ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:14:29 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-28384_m22_nullurl' of git://github.com/skodak/moodle

commit 94ffa4a183c61ddebcc40661256334c350682eac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:02:16 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-28392_m22_capnames' of git://github.com/skodak/moodle

commit 8306a3799ef4a05aa709bca8aa829b2f3ca8d82d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 09:52:33 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-28432_m22_cohortconfig' of git://github.com/skodak/moodle

commit 08ad288d6f9081e8e28e5ce321cf3cfe7e931b5d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 09:44:25 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-28440_m22_jssemicol' of git://github.com/skodak/moodle

commit 310758d65534dc168dec1a427ec29f05d11d68ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 09:39:31 +0800
Tag:    v2.2.0-beta

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

commit 610cc5c3838433d504b969e27be5811b59780ece
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 22:45:13 +0800
Tag:    v2.2.0-beta

Merge branch 'w28_MDL-28363_m22_dimmed' of git://github.com/skodak/moodle

commit 761a000f7353aaf9d8f4c60d9943e85549ffc212
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 22:39:02 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28298-workshop-constant' of git://github.com/mudrd8mz/moodle

commit 508a5bd402a528f8f9375631a92823c8559454d6
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 22:34:37 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28325-enrol-help' of git://github.com/mudrd8mz/moodle

commit 5f65d37cd276982a25ac8090b2602a69a48d155c
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 22:25:13 +0800
Tag:    v2.2.0-beta

Merged branch 'master_MDL-26482' of git://github.com/danmarsden/moodle.git

commit c1d251e890b048025347ece0137ac3be16db19d4
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 20:15:55 +0800
Tag:    v2.2.0-beta

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

commit a4c3145984912f7d57dff6328d7558a1b6aca1a0
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 19:50:50 +0800
Tag:    v2.2.0-beta

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

commit 0704038e41b3e8f47f52e30f6053d9fc381b63bc
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 19:16:43 +0800
Tag:    v2.2.0-beta

Merge branch 'w28_MDL-28345_m22_utf8' of git://github.com/skodak/moodle

commit cc4db9d3c1a264f20f015280e5059bc338194979
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 19:03:22 +0800
Tag:    v2.2.0-beta

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

commit c5fe313c0689f207004a22286c061c15072c60ae
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 18:25:43 +0800
Tag:    v2.2.0-beta

Merge branch 'w28_MDL-23344_m22_loginfocus2' of git://github.com/skodak/moodle

commit ce4a587308f84e885e67b668777f2bc9ef9e2dd8
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 18:17:51 +0800
Tag:    v2.2.0-beta

Merge branch 'w28_MDL-27804_m22_csvauth' of git://github.com/skodak/moodle

commit b96fa1c265ea7db6b9cb86ba304e4dd7edb2bf86
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 18:08:36 +0800
Tag:    v2.2.0-beta

Merge branch 'w28_MDL-28253_m22_managerupgrade' of git://github.com/skodak/moodle

commit 50a3053e62554be70f165301b7d43b7cfdf505ba
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 18:01:08 +0800
Tag:    v2.2.0-beta

Merge branch 'w28_MDL-28313_m22_enroldb' of git://github.com/skodak/moodle

commit 47fa86b30684db1d4efadf8e56298b9ead02ee5e
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 17:47:59 +0800
Tag:    v2.2.0-beta

Merge branch 'w28_MDL-28344_m22_clickjacking' of git://github.com/skodak/moodle

commit 5576c64139ad7756bb5cccd72f00b7ae1111c229
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 17:37:49 +0800
Tag:    v2.2.0-beta

Merge branch 'w28_MDL-28348_m22_meta' of git://github.com/skodak/moodle

commit 1eff23084ed3e369f43f4e79c708442187d98f27
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 17:27:57 +0800
Tag:    v2.2.0-beta

Merge branch 'w28_MDL-28350_m22_wsra' of git://github.com/skodak/moodle

commit 59c8535226d3f2bd62c4577a14ed92cb210de1a3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 13 Jul 2011 20:06:16 +0800
Tag:    v2.2.0-beta

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit 9c52c8a4b0a5a0e5a9980688ee9e896f5698e673
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 16:20:03 +0800
Tag:    v2.2.0-beta

Merge branch 'w27_MDL-25954_m22_cohortnav' of git://github.com/skodak/moodle

commit e2d1b25a5a65c690a2e619fd08c192fcd0ccd8db
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 16:11:50 +0800
Tag:    v2.2.0-beta

Merge branch 'w27_MDL-26965_m22_cohortuploaduser' of git://github.com/skodak/moodle

commit 59772e47497192e6bf4895cdab391fb29d08a658
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 16:01:26 +0800
Tag:    v2.2.0-beta

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

commit 9dae5179cb40dbf4458e3fe317f0bb5c6e8a1fef
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 15:40:12 +0800
Tag:    v2.2.0-beta

Merge branch 'w27_MDL-22404_m22_cohortbulk' of git://github.com/skodak/moodle

commit c430467ca836333775d5568a9b01cec75f5bb473
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 15:02:03 +0800
Tag:    v2.2.0-beta

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

commit 48ae99cbaf2c0b1f1b166892da23468c3793fc47
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 14:50:56 +0800
Tag:    v2.2.0-beta

Merge branch 'w27_MDL-28273_m22_cohortremove' of git://github.com/skodak/moodle

commit 3bbc7a0fc518e7874a6a40ca9d71b884c0bf4532
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 14:18:54 +0800
Tag:    v2.2.0-beta

Merge branch 'w27_MDL-28278_m22_cohorticons' of git://github.com/skodak/moodle

commit 42afcc172a426034914a84530dca1b1f64c227ef
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 13:54:49 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-27429-master' of git://github.com/Beedell/moodle

commit c9d0d331743ca36c2c4c0f21f27a1a71c831e9b4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 13:25:44 +0800
Tag:    v2.2.0-beta

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

commit ed21851b3c895473471d631b80ffd0d1cc4df950
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 13:17:52 +0800
Tag:    v2.2.0-beta

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

commit 7a5c6b98e143ee682e1499c543eed3bf4e208d68
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 11:31:13 +0800
Tag:    v2.2.0-beta

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

commit 08d29fb18dd1e9a7d25b31fef934926bade55d98
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 11:25:21 +0800
Tag:    v2.2.0-beta

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

commit f7776c0fc865683da4cf76a22aedc47691f55118
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 11:14:44 +0800
Tag:    v2.2.0-beta

Merge branch 'glossary_multilang_master' of git://github.com/stronk7/moodle

commit c75d584dccd4cfd6c4e40b1a5a8e32c2e08b1d52
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 11:02:41 +0800
Tag:    v2.2.0-beta

Merge branch 'mod_url_decode_master' of git://github.com/stronk7/moodle

commit 8b6c283f948b0c3d7f0debff6a021cc1c0ccaa8e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 10:53:38 +0800
Tag:    v2.2.0-beta

Merge branch 'backup_groups_master' of git://github.com/stronk7/moodle

commit 8f49f9ce8e655b221626031520e824ae458754bb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jul 2011 13:24:47 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-27934' of git://git.luns.net.uk/moodle

commit 50c1cb0394dba63d33daee22fd0957bb06d03489
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jul 2011 13:17:54 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-27855' of git://git.luns.net.uk/moodle

commit 024ad4bd826e93ef212d959d1d3b635aa66e1f83
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jul 2011 12:03:33 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-27168' of git://git.luns.net.uk/moodle

commit 1a3c5d23662dad8d714b248787fe451ec4d4c9c6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jul 2011 11:19:27 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-26626' of git://git.luns.net.uk/moodle

commit 8323432992de4e0c20f32b86b1412deec07adaaa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jul 2011 11:06:20 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-26611-take2' of git://git.luns.net.uk/moodle

commit 5b966cbb3ba1fbdeeeab00d2c0fb2204bd55c7aa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jul 2011 10:53:48 +0800
Tag:    v2.2.0-beta

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

commit ee992c6c666eedb7783f800a8a0c672e1c205e1e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 05 Jul 2011 16:51:49 +0800
Tag:    v2.2.0-beta

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