Git merges in Moodle 2.1.1 by Sam Hemelryk

commit c7f69afe4a0d6be3d50bcbbc2faff3ac79f988ac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 29 Jul 2011 10:13:43 +0800
Tag:    v2.1.1

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 93c5c0542360b29d1f4cf9e245ea683ef48ad6fe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 15:14:27 +0800
Tag:    v2.1.1

Merge branch 'MDL-28107_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit 30bfe7398104998b3acaaf53ff088cf9e0d48436
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 13:04:19 +0800
Tag:    v2.1.1

Merge branch 'MDL-28228' of git://git.luns.net.uk/moodle into MOODLE_21_STABLE

commit b835eebad913f98b4bb3a384a40e0c39db0da721
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 12:57:01 +0800
Tag:    v2.1.1

Merge branch 'MDL-28232' of git://git.luns.net.uk/moodle into MOODLE_21_STABLE

commit 38a6a195a4944a36b079e4f4c8a758dba9c801ae
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 11:18:37 +0800
Tag:    v2.1.1

Merge branch 'w29_MDL-22584_m21_monsterpaths' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 18c2fcf8f19e00f0e89421d8fd8b7486a6dc6f79
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 11:03:52 +0800
Tag:    v2.1.1

Merge branch 'w29_MDL-27464_m21_continue' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit dbb6d73c8c3eee9599ecf96ecd996ceadbfd5f10
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:59:21 +0800
Tag:    v2.1.1

Merge branch 'w29_MDL-27653_m21_usercasting' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit ae5375722ed95538269d1620add0cb23d98f3122
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:55:04 +0800
Tag:    v2.1.1

Merge branch 'w29_MDL-27796_m21_httphost' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 274d9cf9501686159e270c932f9898a3612a97b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:45:42 +0800
Tag:    v2.1.1

Merge branch 'w29_MDL-27994_m21_creatorcaps' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 7b205e100b1210a254ea0efd6da18907a0117f50
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:39:47 +0800
Tag:    v2.1.1

Merge branch 'w29_MDL-28145_m21_renderer' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 39a84a780b19bd7675d82f18492c7dcad8e290e7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:36:55 +0800
Tag:    v2.1.1

Merge branch 'w29_MDL-28182_m21_userdel' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit c782b4bb58bc009fa8aa44d28e721894090653aa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:30:00 +0800
Tag:    v2.1.1

Merge branch 'w29_MDL-28337_m21_urlparams' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit b1591c656823ad7d49e1f88eb3d8e2223b32abfa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:14:47 +0800
Tag:    v2.1.1

Merge branch 'w29_MDL-28384_m21_nullurl' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 6e488526330765432fad60f2507c64e3b58501e5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 09:52:49 +0800
Tag:    v2.1.1

Merge branch 'w29_MDL-28432_m21_cohortconfig' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 88b014092d4c318f940aafc674c787a9cd6e5362
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 09:45:42 +0800
Tag:    v2.1.1

Merge branch 'w29_MDL-28440_m21_jssemicol' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 5dd5e3161649598cc49b8c6a44dbe4345e6e2263
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 22:45:35 +0800
Tag:    v2.1.1

Merge branch 'w28_MDL-28363_m21_dimmed' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit bd202c15315c5c2706da62da7f02fae3ece22a66
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 22:39:36 +0800
Tag:    v2.1.1

Merge branch 'MDL-28298-workshop-constant_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit 9190787dff1334c281cf226d8a9b3015b2ac3fdb
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 22:34:58 +0800
Tag:    v2.1.1

Merge branch 'MDL-28325-enrol-help_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit 0a02548c232633e7c8c56e09ab21c9c0cb88e801
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 22:27:04 +0800
Tag:    v2.1.1

Merge branch 'm21_MDL-26482' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit a699cbcdbc246f88c0a517856e3f7c8ed3bdbd8b
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 20:18:52 +0800
Tag:    v2.1.1

Merge branch 'wip-MDL-27756-MOODLE_21_STABLE' of github.com:marinaglancy/moodle into MOODLE_21_STABLE

commit 8910a2d15acbe14c9b1e97599b3aabf00f905921
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 19:51:11 +0800
Tag:    v2.1.1

Merge branch 'MDL-27555_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit 0d9cdacf89325852b578f665b0832cd0f278dbcb
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 19:08:41 +0800
Tag:    v2.1.1

Merge branch 'wip-mdl-27837-MOODLE_21_STABLE' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit 982ea1690939d14f8c10f50522b090b70f13dd2f
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 18:26:19 +0800
Tag:    v2.1.1

Merge branch 'w28_MDL-23344_m21_loginfocus2' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 39b10270a119795d0dcc544d3e53edcfc5e57319
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 18:19:20 +0800
Tag:    v2.1.1

Merge branch 'w28_MDL-27804_m21_csvauth' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 4e579f6067d5f9733c301af917c51c3b2f9dbb0c
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 18:10:01 +0800
Tag:    v2.1.1

Merge branch 'w28_MDL-28253_m21_managerupgrade' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit f6c2b4fc1322d6547117da948baa236ea7d4d41f
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 18:04:01 +0800
Tag:    v2.1.1

Merge branch 'w28_MDL-28313_m21_enroldb' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 056c04c9b419ce60e00ba5b7adeaa6dc5601dcba
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 17:39:28 +0800
Tag:    v2.1.1

Merge branch 'w28_MDL-28348_m21_meta' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 03368c0b2ee4244b2e6db046d766f38a4670064c
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 17:28:27 +0800
Tag:    v2.1.1

Merge branch 'w28_MDL-28350_m21_wsra' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 3a9e75e4645cdf0d00294e8a33142ee2cc133ce6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 13 Jul 2011 20:08:56 +0800
Tag:    v2.1.1

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 1541d1a36bd556e45fe5ad31a9b14cef79361744
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 16:02:18 +0800
Tag:    v2.1.1

Merge branch 'wip-mdl-27954-MOODLE_21_STABLE' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit a8361fc2146c1ebe81fb714439afc8983ee5ce0f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 13:56:39 +0800
Tag:    v2.1.1

Merge branch 'wip-MDL-27429-m21' of git://github.com/Beedell/moodle into MOODLE_21_STABLE

commit 903c12c74b7e0d638c07558598f1136b3a86cfa6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 11:31:48 +0800
Tag:    v2.1.1

Merge branch 'm21_MDL-27947' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit 73d78d8de4ca3d3f18e284cdcaba83ac89e5c6dd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 11:25:56 +0800
Tag:    v2.1.1

Merge branch 'MDL-27890_m21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit bbdd6f2dc1067dea7a6fa2ada4f0f715a5d9996e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 11:15:17 +0800
Tag:    v2.1.1

Merge branch 'glossary_multilang_m21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit f738eb06e7f5407b34a5ccd4a12c8d64595ee6b2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 11:04:18 +0800
Tag:    v2.1.1

Merge branch 'mod_url_decode_m21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit 6f30a86bc7d9951a1223eb1849d343cba5d37823
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 10:57:15 +0800
Tag:    v2.1.1

Merge branch 'backup_groups_m21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit baa97ed6232921413de55ab026f0ce76fd2b7403
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jul 2011 11:02:55 +0800
Tag:    v2.1.1

Merge branch 'MDL-28135_MOODLE_21_STABLE' of git://github.com/nebgor/moodle into MOODLE_21_STABLE