Git merges in Moodle 2.1.5 by Sam Hemelryk

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

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

commit b2896fd59f579d54bd380895910442b7a47b9655
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Mar 2012 05:18:51 +0800
Tag:    v2.1.5

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

commit 3bfeac2dfae71ba04e71db47c9021cc8736f5965
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 12:03:11 +0800
Tag:    v2.1.5

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

commit b3e2eb804a27b9d8ab14430b4dcad5aad7fb5540
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 11:55:57 +0800
Tag:    v2.1.5

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

commit d5f1dab8f29a805841e7778c0510aea2f475958b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 11:08:40 +0800
Tag:    v2.1.5

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

commit 3fe51df42ec8013320d10ac555e952512f6a9230
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 10:21:12 +0800
Tag:    v2.1.5

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

commit 36bad5bfcdc6c716715c74effcb8324601e5b1d3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 09:03:20 +0800
Tag:    v2.1.5

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

commit 33bd4e0455eb5a9bde398e8d78c9c9081121d7d7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 08:54:03 +0800
Tag:    v2.1.5

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

commit fc697419add5ed378f12fcc66583c5d9c7240211
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 07:20:48 +0800
Tag:    v2.1.5

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

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

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

commit 974c44643445e80d450d4994c6d963d15a0d8de1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 06:52:36 +0800
Tag:    v2.1.5

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

commit 1fa9907b7d3c97a9633132738211ef0a0430a6b4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Mar 2012 09:36:07 +0800
Tag:    v2.1.5

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

commit 65773fe2fe64b4ab30860eec319bcb5e2f60978e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 22 Feb 2012 05:21:28 +0800
Tag:    v2.1.5

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

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

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

commit 7d03210e74459568966447bee401e329e0239723
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 13:20:14 +0800
Tag:    v2.1.5

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

commit 7e87a3af321c4b71dde7cd6f4daffcb52c7c6e9a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 12:59:08 +0800
Tag:    v2.1.5

Merged MDL-29254 with conflict resolution

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

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

commit 0296cc13c70bc7487717dfe9bdf7fdb23ffcbcc6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 12:13:15 +0800
Tag:    v2.1.5

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

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

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

commit 3921c7242dc6301074cb84220d133c6fcbaf1200
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 11:58:03 +0800
Tag:    v2.1.5

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

commit 9169b3349f285e7609fa7f279cebdfc167fa5995
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 11:52:26 +0800
Tag:    v2.1.5

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

commit f1c1de8924f7217edf527ccd34f331ea0b7d09c2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 11:02:59 +0800
Tag:    v2.1.5

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

commit 09c2f89a62a660eafea3282027f8b84448698e0f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 10:53:23 +0800
Tag:    v2.1.5

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

commit 88b14f0fd0133ff42bc23546e27069693d8fc9ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 10:44:40 +0800
Tag:    v2.1.5

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

commit 06f405d6543d124b41d4b48ae7ae8c5276c987b3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 07:38:54 +0800
Tag:    v2.1.5

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

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

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

commit b2444c0c452ad79279f305115c64ea0dbb416a87
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 06:50:29 +0800
Tag:    v2.1.5

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

commit a005b98ba74d71d025735f2ed0f6179925862945
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 05:29:38 +0800
Tag:    v2.1.5

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

commit cf86dd8c204eb8859839a5ed4de8c59da88facda
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 15 Feb 2012 11:23:24 +0800
Tag:    v2.1.5

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

commit 9560a61be9928bb951e23c823a8cbfa1a495ebe6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 12:41:37 +0800
Tag:    v2.1.5

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

commit 70a03e679efa40bff1413c8f6830caee1b35a4fb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 12:16:21 +0800
Tag:    v2.1.5

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

commit 0e373152be2360ab3afa036061875273b64e787b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:47:59 +0800
Tag:    v2.1.5

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

commit a689533f8fcd7c8790b69bc73e3bc856e6025562
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:31:49 +0800
Tag:    v2.1.5

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

commit 8213be9838d081772e6ffb776485d41d650d2449
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:27:45 +0800
Tag:    v2.1.5

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

commit 79d0f68575992eef77eca7765af764c249bda756
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:20:59 +0800
Tag:    v2.1.5

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

commit a750aff797d73f9543a4e6d9ff61855c82baa5ac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:08:23 +0800
Tag:    v2.1.5

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

commit fd20256bad463642aec5b344ad2846a1ac4bbc0c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 08:59:22 +0800
Tag:    v2.1.5

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

commit 9bfa5bd8cc4587e74afe591195b0666d61115455
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 08:44:44 +0800
Tag:    v2.1.5

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

commit 98899b998ca20d29c754309c980f0a5484b9d3a2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 08:39:23 +0800
Tag:    v2.1.5

Merge branch 'MDL-30821-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit 17b0c930c6f08098fd0a07aeb79ed8ba02478a3b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 05:47:39 +0800
Tag:    v2.1.5

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

commit f6a491d80582793cdf18f5173c64d4b6e19dc8f5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 13:03:55 +0800
Tag:    v2.1.5

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

commit e290039f9621d1ee96edb92a1b0dd4bd9c2b6299
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 13:00:13 +0800
Tag:    v2.1.5

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

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

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

commit 7b53f7845933e7dedc6f9952d526d45f60999d3f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 12:02:23 +0800
Tag:    v2.1.5

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

commit 38b0b2522eb573a238ceb357446d155dd534b5a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 10:30:05 +0800
Tag:    v2.1.5

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

commit 4cb775dcff205b143e49790e975b6974a2767d3e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 09:36:04 +0800
Tag:    v2.1.5

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

commit 58eb3519ea746e68b08ac5bd16bac40d7ed6661f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Jan 2012 11:06:35 +0800
Tag:    v2.1.5

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

commit 0f7c1c8c02ceb896be32320d0849e9747d4163bb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Jan 2012 11:02:42 +0800
Tag:    v2.1.5

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

commit 5d9e0f9291c9c53b43e6fbbb27cdc877d8468bfd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jan 2012 15:35:34 +0800
Tag:    v2.1.5

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

commit b70688316fffe0bf2b995dfb138dce77f130881a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jan 2012 14:44:54 +0800
Tag:    v2.1.5

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

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

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

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

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

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

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

commit d471e3f59d0594a82cb9e66fe6d84ec64f1a1920
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 17:00:00 +0800
Tag:    v2.1.5

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

commit 2d33f4e81cd47f52be315772b37801c301d22ca8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 16:26:32 +0800
Tag:    v2.1.5

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

commit b24713d1ecb516983a43c7dbc4976d714ebfc8ee
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 16:16:54 +0800
Tag:    v2.1.5

Merge remote-tracking branch 'skodak/w03_MDL-27165_m21_confirmed' into MOODLE_21_STABLE

commit 94a763cf9220da55f1b7f09d26b55a5233c8837f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 15:11:39 +0800
Tag:    v2.1.5

Merge remote-tracking branch 'skodak/w03_MDL-29102_m21_autogrouping' into MOODLE_21_STABLE

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

Merge remote-tracking branch 'skodak/w03_MDL-30891_m21_repository' into MOODLE_21_STABLE

commit e333be5d5d81728a5359edac6b2bbdf7e7f95407
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 11:46:10 +0800
Tag:    v2.1.5

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

commit dde7ab2d6ef9b2b68b87e9e5af79d3605f51ab1a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 10:52:13 +0800
Tag:    v2.1.5

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

commit c44874f2014f17b44e8b2f665754c09df405e8f3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jan 2012 09:30:14 +0800
Tag:    v2.1.5

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

commit b48d180e396e2fe326f82f05c47bdc14e7bf371c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jan 2012 09:02:48 +0800
Tag:    v2.1.5

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