Git merges in Moodle 2.0.6 by Aparup Banerjee

commit 4e3676afefbcdf9dcfdde1c2c41b626cb5f9b154
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 24 Nov 2011 16:15:04 +0800
Tag:    v2.0.6

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

commit 1fee8759bc6a03c6699bf24335f9d1510fd0ebfc
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 23 Nov 2011 11:14:47 +0800
Tag:    v2.0.6

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

commit d31ebf34620faf52c798ba74785dd0c5fa6b268b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Nov 2011 16:19:48 +0800
Tag:    v2.0.6

Merge branch 'MDL-30194-m20' of git://github.com/phalacee/moodle into MOODLE_20_STABLE

commit 31550708b462f5debbb81add1b48bf39431edf4d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Nov 2011 16:11:06 +0800
Tag:    v2.0.6

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

commit f50e703e21ee9edabfbf2ee0880b1095f92540d7
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Nov 2011 14:25:28 +0800
Tag:    v2.0.6

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

commit e239fd37b8f7004ca9fe26d1ffbe64bb9bace7c3
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Nov 2011 01:22:20 +0800
Tag:    v2.0.6

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

commit 6c5fe9f7e9ee018d3e7f0253c1e7974a9468915e
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 21 Nov 2011 14:10:07 +0800
Tag:    v2.0.6

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

commit 36d22219bc7e7186070e927a69ecc00333be4008
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 21 Nov 2011 11:53:21 +0800
Tag:    v2.0.6

Merge branch 'MDL-30279-m20' of git://github.com/ankitagarwal/moodle into MOODLE_20_STABLE

commit eff6d318ffe34876f0cf95d89c068ffb3518b187
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 11 Nov 2011 17:02:51 +0800
Tag:    v2.0.6

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

commit 7ba8da8a13cfc8a3be733d2d8aeb54ef09aaa29c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 11 Nov 2011 13:14:52 +0800
Tag:    v2.0.6

Merge branch 'm20_MDL-27037_wiki_visiblegroups_functionality' of https://github.com/mayankgupta/moodle into MOODLE_20_STABLE

commit 4342686ce6cc99610885f2b278c8b21fb1f14b23
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 11 Nov 2011 11:27:01 +0800
Tag:    v2.0.6

Merge branch 'wip-MDL-26712-stable20' of git://github.com/phalacee/moodle into MOODLE_20_STABLE

commit 41752c58bc12661e9ca97615303174678a03fbf8
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 09 Nov 2011 17:55:28 +0800
Tag:    v2.0.6

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

commit bca9d87c4eb311929e3cc3b55342f38bab1f481c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 09 Nov 2011 13:38:07 +0800
Tag:    v2.0.6

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

commit 8935486dc4f0734febf7e6450f2a54dd197df2a5
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 09 Nov 2011 11:05:15 +0800
Tag:    v2.0.6

Merge branch 'wip-MDL-24200-stable20' of git://github.com/phalacee/moodle into MOODLE_20_STABLE

commit ce8e5673027bee05aadc94312bdb8bdfe310b5ac
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 08 Nov 2011 15:18:54 +0800
Tag:    v2.0.6

Merge branch 'wip-mdl-27521-stable20' of git://github.com/phalacee/moodle into MOODLE_20_STABLE

commit 3555da1d3c39db7954e1f49b207a7aeebb4ab485
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 08 Nov 2011 11:31:15 +0800
Tag:    v2.0.6

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

commit a4276fe09638e602d145976bc8f268b9fbb552ee
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 01 Nov 2011 15:28:25 +0800
Tag:    v2.0.6

Merge branch 'w43_MDL-30005_m20_uri' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit d14031e9aef5be9a0d9999d8f18e0c7942c43aa8
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 01 Nov 2011 12:16:42 +0800
Tag:    v2.0.6

Merge branch 'w43_MDL-29990_m20_navcontinue' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit ace896cda72a2ae65056eee5f3be0024396098b1
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 01 Nov 2011 12:07:57 +0800
Tag:    v2.0.6

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

commit 4b25984a20a24e8ded4d24d5aef8d47b024b8483
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 31 Oct 2011 16:06:03 +0800
Tag:    v2.0.6

Merge branch 'w43_MDL-29966_m20_grouploading' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 44aba13a35b9de23d91c3ba8cba4747a7287320d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 31 Oct 2011 15:19:43 +0800
Tag:    v2.0.6

Merge branch 'MOODLE_20_STABLE' of git://git.moodle.org/integration into MOODLE_20_STABLE

commit 2db9576147bf14988adcfadb9cc18e60ed03f882
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 24 Oct 2011 17:05:49 +0800
Tag:    v2.0.6

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

commit 1e898eefe343da24123fd0cba6165a2026ee456d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 24 Oct 2011 14:49:54 +0800
Tag:    v2.0.6

Merge branch 'MDL-29619-m20' of git://github.com/ankitagarwal/moodle into MOODLE_20_STABLE

commit f36e320c7edc3ffef938a56f885774463986b5fa
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 11 Oct 2011 11:26:07 +0800
Tag:    v2.0.6

Merge branch 'wip-MDL-27278-m20' of git://github.com/samhemelryk/moodle into MOODLE_20_STABLE

commit 5775674f8c171b50f3509d9454b4a6623ca11af0
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 11 Oct 2011 09:28:02 +0800
Tag:    v2.0.6

Merge branch 'wip-MDL-28582-m20' of git://github.com/samhemelryk/moodle into MOODLE_20_STABLE

commit 422d1ed2746b2f97ae4383a5f1125fbedab8c059
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 10 Oct 2011 23:15:16 +0800
Tag:    v2.0.6

Merge branch 'wip-MDL-29224-m20' of git://github.com/samhemelryk/moodle into MOODLE_20_STABLE

commit c868308b89a86449910c8b09be848cf510c9717f
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 10 Oct 2011 22:47:27 +0800
Tag:    v2.0.6

Merge branch 'wip-MDL-29672-m20' of git://github.com/samhemelryk/moodle into MOODLE_20_STABLE