Git merges in Moodle 2.0.4 by Sam Hemelryk

commit 03e29fff56afe783ced154d196a70043a119ab29
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 29 Jul 2011 10:13:30 +0800
Tag:    v2.0.4

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 213eaa94f6fac90816d988769de7846c94217236
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 15:14:39 +0800
Tag:    v2.0.4

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

commit 2e3a96e192efa81f4e07965573210a91b6cf8060
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 11:18:45 +0800
Tag:    v2.0.4

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

commit 417fdfab6bbdcfc3f5b64704ec06912ae9cd1050
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 11:04:02 +0800
Tag:    v2.0.4

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

commit 77c9ae457d432cb46256e1bde776ce31f171259c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:59:30 +0800
Tag:    v2.0.4

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

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

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

commit 538e680d39a6c03467f0be701757ea53b8007869
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:45:51 +0800
Tag:    v2.0.4

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

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

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

commit 100308ce24e441fb7a1f2d4408d465529613a2d1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:37:05 +0800
Tag:    v2.0.4

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

commit f6fc3616de8cedddfa6e9ddccf2344c0037b778c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:15:05 +0800
Tag:    v2.0.4

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

commit 9a8343cdde5388fe39527f613585398d55c96fa9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 09:53:02 +0800
Tag:    v2.0.4

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

commit a4e3607a212ca3ee9bd0d87e7fbbff9437329075
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 09:45:53 +0800
Tag:    v2.0.4

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

commit a6c44179e52ab474ef829c17b3e1e8cd72e8e2d2
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 22:48:11 +0800
Tag:    v2.0.4

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

commit ab93b029191f038a17946cb2bc93d6c0fd3a529d
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 22:40:22 +0800
Tag:    v2.0.4

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

commit 07ea543a1c60a2a6caa223890d66b65ad1335103
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 22:35:16 +0800
Tag:    v2.0.4

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

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

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

commit 60e7f2b113d95c164ff0fc65b422f4e953164bdb
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 19:51:39 +0800
Tag:    v2.0.4

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

commit 68bc5b7b681e2aae9ab4a4f5e9a0419fc31a7778
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 18:19:51 +0800
Tag:    v2.0.4

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

commit 45222fc50f71d318ffb3ca339d0180b0de982ec3
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 18:10:30 +0800
Tag:    v2.0.4

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

commit 78092d6742abb7a16a4a260e24bfb7e7fcee1ed3
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 18:04:32 +0800
Tag:    v2.0.4

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

commit a3fe5348ab2c07316091d8c64c0e33afccdd55d3
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 17:39:56 +0800
Tag:    v2.0.4

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

commit e3f6f3089673ba492ec3ea918a0213564825aed4
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 17:29:01 +0800
Tag:    v2.0.4

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

commit b22eb6a987361a5ad73ac2b670d0cdfb77ec3288
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 13 Jul 2011 20:09:42 +0800
Tag:    v2.0.4

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 77de688b8231e2628543c29cdab45f9e183d2f3c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 16:02:00 +0800
Tag:    v2.0.4

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

commit dd8e61891791602deaab6795071fab08cf9baa6f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 14:54:48 +0800
Tag:    v2.0.4

Merge branch 'MDL-28227_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit 05deeaacdb5b52e0ae0c2743bf5c0743e51fe25a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 11:32:04 +0800
Tag:    v2.0.4

Merge branch 'm20_MDL-27947' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE

commit 19dd6873771054df938f9e640a99f0672f1aeef9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 11:04:35 +0800
Tag:    v2.0.4

Merge branch 'mod_url_decode_m20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit f2c12522c3676889b6c6c780f90b8bd588fe59e3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 10:57:33 +0800
Tag:    v2.0.4

Merge branch 'backup_groups_m20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit 668a9eb90b18f09da15af45797fe32ec0d5e2b2b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jul 2011 12:11:14 +0800
Tag:    v2.0.4

Merge branch 'MDL-27716_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit ed26ad33caaedfd4cbbb2312ae13261a7293857f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jul 2011 11:05:11 +0800
Tag:    v2.0.4

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

commit 39025fe1775c5aa2c5ad217e41560d9f32506eef
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 01 Jul 2011 15:08:59 +0800
Tag:    v2.0.4

Merge branch 's11_MDL-28121_split_20' of github.com:dongsheng/moodle into MOODLE_20_STABLE

commit 4a7e2298a3e0edca4a8e28e916261f0ba2805717
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 30 Jun 2011 10:50:10 +0800
Tag:    v2.0.4

Merge branch 'MDL-24684_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit abfe9dbe6e3027e31c9ab0e3025c518f67f0977d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 28 Jun 2011 17:05:41 +0800
Tag:    v2.0.4

Merge branch 'MDL-28023_assignment_jabber_20' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE

commit 8c75bb59760322872f970c006227f5abfd0f460a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 28 Jun 2011 10:17:48 +0800
Tag:    v2.0.4

Merge branch 's11_MDL-27866_pix_url_20' of git://github.com/dongsheng/moodle into MOODLE_20_STABLE

commit e78632643cac442014ffbb3a65aded1f659d508b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 28 Jun 2011 10:13:15 +0800
Tag:    v2.0.4

Merge branch 'MDL-28014_stable' of git://github.com/grabs/moodle into MOODLE_20_STABLE

commit d9c19266c80a1e436810ed935bf93655c367590b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 23 Jun 2011 10:44:32 +0800
Tag:    v2.0.4

Merge branch 'MDL-27169_m20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit 8445c4724c4e2ec7b5a7e23ed66230f6f6602d55
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 22 Jun 2011 17:16:00 +0800
Tag:    v2.0.4

Merge branch 'MDL-27966_m20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit 3e6c1d4d55b34bf437ef836f4c6adc4a91588098
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 22 Jun 2011 17:10:53 +0800
Tag:    v2.0.4

Merge branch 'MDL-25811_m20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit 97161e50081668b5b5b1453676fa017bcc341d08
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Jun 2011 09:48:57 +0800
Tag:    v2.0.4

Merge branch 'MDL-27286_m20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit c1d93d47e960af78f95252fccd4dd1f6babef54c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 15:09:16 +0800
Tag:    v2.0.4

Merged branch 'MDL-26960-for-20_STABLE' of git://git.luns.net.uk/moodle with changes

commit 6160c1721c17fe43cf4f3c6902495be0ca51a35e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 14:54:06 +0800
Tag:    v2.0.4

Merge branch 'm20_MDL-27404' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE

commit 71472b0a8263d6a4d334456a65e3e41144e8f370
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 11:32:55 +0800
Tag:    v2.0.4

Merge branch 'MDL-16168-CAS-crash-if-no-LDAP-20' of https://github.com/iarenaza/moodle into MOODLE_20_STABLE

commit ba3721d4636ab9bb87f884c7fe0dff13934276ef
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 11:18:48 +0800
Tag:    v2.0.4

Merge branch 'MDL-27757-20' of git://github.com/srynot4sale/moodle into MOODLE_20_STABLE

commit 1a1f7b0eec2dd40484dae378846d5d51a103c5ce
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 11:14:02 +0800
Tag:    v2.0.4

Merge branch 'MDL-27783-20STABLE' of git://github.com/mouneyrac/moodle into MOODLE_20_STABLE

commit 79121602c45da2cac7641908005a9e6b919c109e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 10:35:55 +0800
Tag:    v2.0.4

Merged branch 'MDL-27801_MOODLE_20_STABLE' of git://github.com/kordan/moodle.git with changes

commit bca840b4bc8362b3c3063b07cf0c42cdba35a2fa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 16:32:18 +0800
Tag:    v2.0.4

Merged branch 'MDL-27695_MOODLE_20_STABLE' of git://github.com/nebgor/moodle.git with changes

commit 80406e9dd8ef2d0b7adac08f285ad5a42824fdd0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 13:52:39 +0800
Tag:    v2.0.4

Merge branch 'MDL-27737_2.0' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit f4c5e5044024dea21dbaed80e502715b5f6c2ddb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 13:51:10 +0800
Tag:    v2.0.4

Merged branch 'MDL-25775_stable' of git://github.com/grabs/moodle.git

commit 1382f8a549c1847ec894e6ef0b296f4498bfb5fd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 13:43:51 +0800
Tag:    v2.0.4

Merged branch 'MDL-27118-MOODLE_20_STABLE' of git://github.com/epsd/moodle.git

commit f279137a862f879dd78049b4950dfd0b42cd7633
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 13:39:29 +0800
Tag:    v2.0.4

Merge branch 'MDL-27294-MOODLE_20_STABLE' of git://github.com/epsd/moodle into MOODLE_20_STABLE

commit f2ba68efc1955e0ecc7d32f51e910ed2446093b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 13:04:57 +0800
Tag:    v2.0.4

Merged branch 'MDL-27692' of git://github.com/MaryE/moodle.git

commit 629ea4957bcd720b95d0e1022f67df3ec720ffa8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 11:31:14 +0800
Tag:    v2.0.4

Merge branch 'MDL-25477-MOODLE_20_STABLE' of git://github.com/epsd/moodle into MOODLE_20_STABLE

commit 4c1db5b4eab0e1b25ae5bda1618729e5a009986d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 Jun 2011 16:31:38 +0800
Tag:    v2.0.4

Merged branch 's9_MDL-26392_wiki_files_20' from git://github.com/dongsheng/moodle.git with fixes

commit 7ea0f8e5196609fe975514d7bdf9d9e979b15aaa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 Jun 2011 16:25:14 +0800
Tag:    v2.0.4

Merge branch 'MDL-27734-workshop-example-weight_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit ece057943d1fcab25c61619c36e8861b4615a266
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 Jun 2011 16:22:49 +0800
Tag:    v2.0.4

Merge branch 'MDL-27733-workshop-deadlines_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit edb8d49d3503f074ada266270a0a65b90bf1786a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 Jun 2011 16:14:52 +0800
Tag:    v2.0.4

Merge branch 'MDL-27732-glossary-introformat_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit 8c23e3f5ffdaab6c596e78c4acee6d6ad8418e2d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 Jun 2011 16:11:33 +0800
Tag:    v2.0.4

Merge branch 'admin_whitespace_cleanup_m20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit 98c1207c46f799c911b8c4c4158ae23e36ee6202
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 May 2011 17:22:41 +0800
Tag:    v2.0.4

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

commit 3466a42f31a6357a1618cb98a6af450674d8c312
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 May 2011 13:07:24 +0800
Tag:    v2.0.4

Merge branch 'MDL-25512' of git://github.com/MaryE/moodle.git

commit 2e8ab7269c33a3900266317e5202713dd67fb8bf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 May 2011 09:33:19 +0800
Tag:    v2.0.4

Merge branch 'MDL-27636_20stable' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit 72ca02b0b27a3c3a347add35d5cc5ea1a90ab47c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 May 2011 09:04:34 +0800
Tag:    v2.0.4

Merge branch 'MDL-27009' of git://github.com/aolley/moodle into MOODLE_20_STABLE

commit f9ba5c522270c07c1068565efbbe8204033c6b37
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 May 2011 11:34:29 +0800
Tag:    v2.0.4

Merge branch 'm20_MDL-25177_choice_windowfix' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE

commit f79dd3b57d8c5dd68bc013a1d09417ec385e2a7b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 May 2011 11:25:25 +0800
Tag:    v2.0.4

Merge branch 'MDL-27530_stable' of git://github.com/grabs/moodle into MOODLE_20_STABLE

commit c7d4a92ccf12121d4139dd8edcfba217f73dda19
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 May 2011 12:32:12 +0800
Tag:    v2.0.4

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

commit 5bd0e7af9fb0770a84439e44a8279fa34acc720e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 May 2011 12:16:26 +0800
Tag:    v2.0.4

Merge branch 'MDL-27387_rating_scale_validation' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE

commit 794fb0e5656826797b0d009abcfa230f2a818122
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 May 2011 12:10:58 +0800
Tag:    v2.0.4

Merge branch 'MDL-26075_stable' of git://github.com/grabs/moodle

commit 633fcef536806e187562618050649cc6080845d2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 May 2011 09:54:15 +0800
Tag:    v2.0.4

Merge branch 'MDL-27140_m20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit 6867fc94b79b5cd1aee382fc408e426767cd6ec7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 May 2011 10:52:22 +0800
Tag:    v2.0.4

Merge branch 'MDL-27325_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit 8385249f5b09c75f05f15fa02c3b0c0e2435249a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 May 2011 10:22:20 +0800
Tag:    v2.0.4

Merge branch 'MDL-27367-20' of git://github.com/srynot4sale/moodle into MOODLE_20_STABLE