Git merges in Moodle 2.0.5 by Sam Hemelryk

commit 019e897604d6759dd1ce1ac0a10c23fe02123693
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Oct 2011 12:58:07 +0800
Tag:    v2.0.5

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

commit c03a8543f0b01c169237a2060b3208a28afe2c7e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Oct 2011 11:21:48 +0800
Tag:    v2.0.5

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

commit 77738c4562b63db42c08f211e54de26bd42600fb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 12:09:35 +0800
Tag:    v2.0.5

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

commit e93dd0d65092ad281daace30a379da2844887224
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 10:10:05 +0800
Tag:    v2.0.5

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

commit d6a7cac9915458531f41cfd332b217f0d16d1210
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 09:38:14 +0800
Tag:    v2.0.5

Merge branch 'MDL-28566-M20' of git://github.com/lazydaisy/moodle into MOODLE_20_STABLE

commit ec9b8fb68d275cc5087bb90e1e774c76b083478a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 09:30:26 +0800
Tag:    v2.0.5

Merge branch 'MDL-29323-M20' of git://github.com/lazydaisy/moodle into MOODLE_20_STABLE

commit 8bd76f9e652e621411ba2d0b9403b9423cc87462
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 09:23:59 +0800
Tag:    v2.0.5

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

commit c06645a5396b4f974b69d293df7f779344617508
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 08:23:37 +0800
Tag:    v2.0.5

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

commit 85906b4ae5e16f0070fccd85254407432fabe3e6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 07:50:10 +0800
Tag:    v2.0.5

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

commit 424cb3b0efd3fed4ed78f7fc6296d0bdd6a66715
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 07:28:27 +0800
Tag:    v2.0.5

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

commit a53366f7ab139da664e063c5a0be29cfa2294f14
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Sep 2011 09:17:36 +0800
Tag:    v2.0.5

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

commit bacfad505d0b152da13f6019ae5fbd207ed0f7d3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Sep 2011 06:17:59 +0800
Tag:    v2.0.5

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

commit 5ea58ff4e14a6454e9fa0cce41062e0e4d413228
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 07:36:18 +0800
Tag:    v2.0.5

Merge branch 'MDL-29336-numerrors-mapping-20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit 3603e0856ac993521f9be8b76a13d8edab8b7ba6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 05:45:57 +0800
Tag:    v2.0.5

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

commit 91c578c06dcd8c2aea282393d8199a22ce871ea6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 05:39:41 +0800
Tag:    v2.0.5

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

commit 5e51b68a1867529f3b22cc487620f7ea044ffc3b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Sep 2011 08:13:29 +0800
Tag:    v2.0.5

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

commit 024315981725216edee5af96c5b777cc7e5e0bb4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Sep 2011 07:59:03 +0800
Tag:    v2.0.5

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

commit f6b9535c4bd3011b3fe74a7ade2c5684f5384690
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 13:00:23 +0800
Tag:    v2.0.5

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

commit 62920e80bace2288de29bd5d01901df1d745b56c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 16:27:41 +0800
Tag:    v2.0.5

Merged branch 'MDL-22232_easier_turn_off_notifications_20' from git://github.com/andyjdavis/moodle.git with conflict resolution

commit 5fbc1470b10ac2d43642c2401f9115847cfa6341
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 15:49:46 +0800
Tag:    v2.0.5

Merge branch 'MDL-29211_M20' of git://github.com/kordan/moodle into MOODLE_20_STABLE

commit 52c00a59c67263176d820c0bce438185d389f98f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 13:26:44 +0800
Tag:    v2.0.5

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

commit 13b7a5d4e5d137bf87a1c87564c36ddfff8167be
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 10:39:42 +0800
Tag:    v2.0.5

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

commit f4aea09ea4b974b615f5913642b4d3ca0b7cc837
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 10:31:03 +0800
Tag:    v2.0.5

Merge branch 'w36_MDL-29312_m20_cookieless' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit ef9d05cd990ad4a958bbc58eb48703b898268797
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 09:21:01 +0800
Tag:    v2.0.5

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

commit f364f5628f7c28724b853be62a9d888c252e309c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Sep 2011 12:08:13 +0800
Tag:    v2.0.5

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

commit 2c90eef264e84a4bc4d39fd6341022837b7adef1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Sep 2011 12:03:12 +0800
Tag:    v2.0.5

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

commit b1e71dac7d5c279eda4863740338b8b3cb4ee2db
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Sep 2011 09:37:13 +0800
Tag:    v2.0.5

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

commit 96083d8068751732110e21851ddbdc1fc066dc8b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Aug 2011 09:05:38 +0800
Tag:    v2.0.5

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

commit 31bb03f6e1e2286812de559cbd2571d4e86a1e26
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Aug 2011 08:55:00 +0800
Tag:    v2.0.5

Merge branch 'dev_MDL-27289_boxnet_20' of git://github.com/dongsheng/moodle into MOODLE_20_STABLE

commit d3e5802d97f3e95d5d755294eced9903e0f84d58
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Aug 2011 08:25:16 +0800
Tag:    v2.0.5

Merge branch 'MDL-29135-mnet-login_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit 3e7ff59eb43d3e5280c9e3f589d8ab116cee1d7b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Aug 2011 14:10:41 +0800
Tag:    v2.0.5

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

commit 47a6e69179282a89e2176e93de13e0a4e9a97947
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 14:00:08 +0800
Tag:    v2.0.5

Merged branch 'MDL-28575_MOODLE_20_STABLE' of git://github.com/kordan/moodle.git with conflict resolution

commit 4ecd7134e5d4f6ee7e2d289bbc5c01397960b1ea
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 13:45:05 +0800
Tag:    v2.0.5

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

commit 3bbbd26ee6546c8d607d56aac03138662997887e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 11:19:18 +0800
Tag:    v2.0.5

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

commit 81c77993e3808bba68fe24d6bfbac19a41679a6f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:47:21 +0800
Tag:    v2.0.5

Merge branch 'w31_MDL-27586_m20_browser' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 6aec4988125e7180dd0c590c643680ae028f918d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:25:55 +0800
Tag:    v2.0.5

Merge branch 'w31_MDL-27685_m20_pglike' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 11909e87a0a9ac1b7226f2c1edb8070666778555
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:21:05 +0800
Tag:    v2.0.5

Merge branch 'w31_MDL-28382_m20_iis' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 48db633522c0c9d433563ef32c73c627a374d9d9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:09:56 +0800
Tag:    v2.0.5

Merge branch 'w31_MDL-28450_m20_defgroup' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 0f68bcbc52b3c9d68a79877987c4c187ac2c9441
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 17:47:13 +0800
Tag:    v2.0.5

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

commit c440ddfb583b2c600a2b814b9950a71106235806
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 16:59:08 +0800
Tag:    v2.0.5

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

commit 6a60e3f282a20c745970e4397988df2ad2546972
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 16:52:22 +0800
Tag:    v2.0.5

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

commit f15c1b78ab16078b750381f17c9af31cc0f244b4
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 16:44:33 +0800
Tag:    v2.0.5

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

commit 43b2bb6cd9f0893d15f0cbde32eb495fac92f6b7
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 16:36:16 +0800
Tag:    v2.0.5

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

commit 7d5f92870e62c787f46d8dba595397586d1790e8
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 14:09:57 +0800
Tag:    v2.0.5

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

commit e99d784ffe338bdb9692ae3166a4877657180f7f
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 13:41:36 +0800
Tag:    v2.0.5

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

commit 25f8084ba0914723636280f64b7670cc7898e0fa
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 13:38:00 +0800
Tag:    v2.0.5

Merge branch 'MDL-28510_20_STABLE' of git://github.com/marxjohnson/moodle into MOODLE_20_STABLE

commit 187c395673de6b479cd908f6dc33a7de144636b1
Author: unknown <SamandJen1@.(none)>
Date:   Tue, 02 Aug 2011 13:27:00 +0800
Tag:    v2.0.5

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

commit d5addee28fea58601389435e81e85ebc4eddc865
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 12:22:57 +0800
Tag:    v2.0.5

Merge branch 'MDL-28487-typo_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit a8562f6c0163bc9876beb9c5bc6d6d5c10ef9eb0
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 11:49:21 +0800
Tag:    v2.0.5

Merged branch 'm20_MDL-28548' of git://github.com/danmarsden/moodle.git with comment changes