Git merges in Moodle 2.2.2 by Sam Hemelryk

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

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

commit bd8718922292889739da98ecffc4f6a398cecdcf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Mar 2012 05:19:00 +0800
Tag:    v2.2.2

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

commit 575a5530944f28dd67350265995470146503557e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 12:03:20 +0800
Tag:    v2.2.2

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

commit 7d6c1a19bbdbe90deec1b033bdfc230d0568f33e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 11:56:05 +0800
Tag:    v2.2.2

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

commit 94cfcb36a58566f96e12651f4e152686373637b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 11:13:08 +0800
Tag:    v2.2.2

Merge branch 'MDL-29347-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit 0c0ae1c6969121702b68b241b7ab5f3ee6f7da76
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 11:08:30 +0800
Tag:    v2.2.2

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

commit f8c24829ab62249d2e9dcaeac08c9f45d22e6cbd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 10:21:19 +0800
Tag:    v2.2.2

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

commit 4e738cab73ec2892bc031f2fddaa54031543655c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 09:03:26 +0800
Tag:    v2.2.2

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

commit 62a2c4fd22cbe3678bfb4b121b5ae0fa3a77287c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 08:54:27 +0800
Tag:    v2.2.2

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

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

Merge branch 'm22_MDL-31749' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit e6f2103ce7a72e74b881802f0124b9e1c581cf21
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 07:22:19 +0800
Tag:    v2.2.2

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

commit fecb44d7b5132df618807aef63686a236afb3dc7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 07:05:39 +0800
Tag:    v2.2.2

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

commit c71b744a43ac40eca6fc3385e82b24bec8153de6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 06:52:45 +0800
Tag:    v2.2.2

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

commit 5c3c0a8ce5c61b1582a70713f6435627782186d2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 06:30:53 +0800
Tag:    v2.2.2

Merge branch 'MDL-31466-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit ebbb9143469e78ef2110e3fc93712fb89e7c913a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Mar 2012 09:34:52 +0800
Tag:    v2.2.2

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

commit 68eeca86213a91d8ca169cdb85c80a16907949f0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 22 Feb 2012 05:21:53 +0800
Tag:    v2.2.2

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

commit 31593361a8eaf2257ed1f6e27d5f708777f9c70d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 21 Feb 2012 09:56:13 +0800
Tag:    v2.2.2

Merge branch 'MDL-30249-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

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

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

commit ab04c70d56d8f4024a89a0c80d7a8fbec4223696
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 13:20:22 +0800
Tag:    v2.2.2

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

commit ace2654b5d734281bfe0e369573d0af54c077112
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 13:06:06 +0800
Tag:    v2.2.2

Merged MDL-29254 with conflict resolution

commit c8072f8b508729f6ece7f56d683846d8ed5edcc8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 12:29:33 +0800
Tag:    v2.2.2

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

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

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

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

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

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

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

commit 5a91cf1e2a53119cdd41f1805845fe2195055ef2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 12:04:30 +0800
Tag:    v2.2.2

Merge branch 'm22_MDL-31381' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit 3ba632dce5fad8ee31e774fe3b7ae9738273a961
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 11:58:20 +0800
Tag:    v2.2.2

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

commit 10701ea8147d7d59fdb785ea9d86fba3a46a7fce
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 11:52:35 +0800
Tag:    v2.2.2

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

commit 7654fe581170eb7caf896ae2dd36ba77da8f642a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 11:03:08 +0800
Tag:    v2.2.2

Merge branch 'm22_MDL-31397' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit 34d7e1ce9b96225f9ef20676cd3a33470e8b3afa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 10:53:36 +0800
Tag:    v2.2.2

Merge branch 'm22_MDL-31652' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit 6f22c38b483be44c9ba2b7cf64c24fc3fbd0995c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 10:44:47 +0800
Tag:    v2.2.2

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

commit a55688b394fc66589313c30680acb9599d0c52a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 07:39:02 +0800
Tag:    v2.2.2

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

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

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

commit 11a3fcb1be094820a86efce9b47942074ce35d75
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 06:50:39 +0800
Tag:    v2.2.2

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

commit 3fe335c455d8c80f0c46fbbab767d5782894daf7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 05:29:46 +0800
Tag:    v2.2.2

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

commit 124e846e833a7165947e786dae63c15645d89b92
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 16 Feb 2012 10:40:38 +0800
Tag:    v2.2.2

Merge branch '22_MDL-30935_lti_change_instructor_role_to_teacher' of git://github.com/gerrywastaken/moodle into MOODLE_22_STABLE

commit 646704c8d074e912a74fb4e9533a9000be6e0282
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 15 Feb 2012 11:23:33 +0800
Tag:    v2.2.2

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

commit ebeacb73c9dbdebccf1374ac8bdf4f1e4f4717f3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 12:41:45 +0800
Tag:    v2.2.2

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

commit 43c6a29cc6e7acde499df610ef3058065e0cf861
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 12:14:22 +0800
Tag:    v2.2.2

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

commit 01348282b4ccf393d421d65befc44d93c95c6e71
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 12:00:25 +0800
Tag:    v2.2.2

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

commit 4e010423430311fedb2bef53f097a255634b0bde
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:53:46 +0800
Tag:    v2.2.2

Merge branch 'MDL-30688-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit 8348cea56a40230ce39407e0add19bd6c69b6264
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:48:09 +0800
Tag:    v2.2.2

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

commit 5129af80515d984c523362f19138be0f5dc2496e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:32:00 +0800
Tag:    v2.2.2

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

commit a6f81e7fd86765dbf86a40b5f3a46c580d4fcb3c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:27:57 +0800
Tag:    v2.2.2

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

commit af61dca6d05e9fae63bd2b8f838672fe57f42640
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:21:07 +0800
Tag:    v2.2.2

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

commit 03134095f9f9d3591497772598021884e60d0ebd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:12:22 +0800
Tag:    v2.2.2

Merge branch '22_MDL-30935_lti_change_instructor_role_to_teacher' of git://github.com/gerrywastaken/moodle into MOODLE_22_STABLE

commit 908de866bd1ea2808774585f9e2b0c464614aa5d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:08:13 +0800
Tag:    v2.2.2

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

commit 01080b468fa24a29b9d346889a74646bc02d8ef5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 08:59:04 +0800
Tag:    v2.2.2

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

commit 66bd7ae432d0e2ec210d5bf10dcfd3053c6bc6b4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 08:44:52 +0800
Tag:    v2.2.2

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

commit 2787eeb9b32575c175f27ac11a38b087d6473be9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 05:47:30 +0800
Tag:    v2.2.2

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

commit bc967db3d45a17a5c99e96a7a4af093e0250da5a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 13:04:06 +0800
Tag:    v2.2.2

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

commit 877d9f8430b3993a2b651b8e14f088262d247a47
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 13:00:23 +0800
Tag:    v2.2.2

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

commit a87151d552b649f15e866ebdf8c0c75f6bc06d8e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 12:52:36 +0800
Tag:    v2.2.2

Merge branch 'm22_MDL-31085' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

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

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

commit 38d0571f239c36fcd6d4cbb261f6aff4d3ccee0f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 12:17:29 +0800
Tag:    v2.2.2

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

commit ff60281e4fc4e2dea2787df026a2d81cd5d16b88
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 12:02:32 +0800
Tag:    v2.2.2

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

commit 8b927cfb8bc15e6291bcf7e6749723233f2093b4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 10:30:13 +0800
Tag:    v2.2.2

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

commit 5eb8ad61291b4be4f3e56a682719f0f374a5368d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 10:26:21 +0800
Tag:    v2.2.2

Merge branch 'MDL-31554_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 834214386243d2e08dad46692caae65ea0f1a433
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 09:36:14 +0800
Tag:    v2.2.2

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

commit 887ec885b1d957e7d82908927a47284b190e6969
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Jan 2012 10:29:22 +0800
Tag:    v2.2.2

Merge branch 'w04_MDL-30509_m22_slowcohort' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit d0c82a5609d1a74e87d9d26035d022d02b63448c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Jan 2012 11:28:38 +0800
Tag:    v2.2.2

Merge branch 'MDL-31205_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 11942210a24e2086cf9e6cd55f2120d231d6a1ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Jan 2012 11:07:00 +0800
Tag:    v2.2.2

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

commit a67a3a8eecfe7ac6b5054b969e4380aacb98838d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Jan 2012 11:03:02 +0800
Tag:    v2.2.2

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

commit 6f421476a92608d90aa867dc0cbad10a0d016441
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jan 2012 15:37:48 +0800
Tag:    v2.2.2

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

commit 3c6d27b44bdeced759752a1b4753bafd8129f291
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jan 2012 15:15:52 +0800
Tag:    v2.2.2

Merge branch 'w04_MDL-31178_m22_enrolledws' of git://github.com/skodak/moodle into MOODLE_22_STABLE

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

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

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

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

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

Merge branch 'MDL-31077-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

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

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

commit 1c1b04c99409313f6704985e01d0a8190cb7457a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 16:59:27 +0800
Tag:    v2.2.2

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

commit 8a9edd6dba26ac60973a93b1082d91ce7bab398f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 16:41:24 +0800
Tag:    v2.2.2

Merge branch 'MDL-31135_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 282dcd3c0329a77154bdbd28ea6b3d84d4dc5f0b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 16:27:38 +0800
Tag:    v2.2.2

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

commit d5c88f9333a675dd0f534d705057e0c21cd3f205
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 16:17:09 +0800
Tag:    v2.2.2

Merge remote-tracking branch 'skodak/w03_MDL-27165_m22_confirmed' into MOODLE_22_STABLE

commit 199ba4286b98981a63e01baef44b4be831184d7c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 15:11:07 +0800
Tag:    v2.2.2

Merge remote-tracking branch 'skodak/w03_MDL-29102_m22_autogrouping' into MOODLE_22_STABLE

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

Merge remote-tracking branch 'skodak/w03_MDL-30891_m22_repository' into MOODLE_22_STABLE

commit 735d8ce2ce959557a9a324f6810185154925d1f0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 14:56:06 +0800
Tag:    v2.2.2

Merge remote-tracking branch 'skodak/w03_MDL-30958_m22_yuissl' into MOODLE_22_STABLE

commit 43812bf883f4b09f838092ddc9601be029d1bb09
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 14:49:28 +0800
Tag:    v2.2.2

Merge remote-tracking branch 'skodak/w03_MDL-31011_m22_loglinks' into MOODLE_22_STABLE

commit 6f960202e775a5c7bdcddb2294eb0a3a4671c1a3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 14:38:36 +0800
Tag:    v2.2.2

Merge remote-tracking branch 'skodak/w03_MDL-31035_m22_identitynotice' into MOODLE_22_STABLE

commit ff65ab25c24410e90bf05ce969b21292451648dd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 14:34:58 +0800
Tag:    v2.2.2

Merge remote-tracking branch 'skodak/w03_MDL-31117_m22_grouptodo' into MOODLE_22_STABLE

commit ac0d9c6411cbcce5075d41124082a23107e56597
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 14:33:01 +0800
Tag:    v2.2.2

Merge remote-tracking branch 'skodak/w03_MDL-31109_m22_maintenance' into MOODLE_22_STABLE

commit 1480ead173f1bb9ba15ee1655eaae12e7c1c8d55
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 12:00:12 +0800
Tag:    v2.2.2

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

commit 2d48474f2a6fd2c46d5c200f254a41add16e221b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 11:48:50 +0800
Tag:    v2.2.2

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

commit 6bf567100abbabff345a68df5643161fafb67fb9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 10:59:41 +0800
Tag:    v2.2.2

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

commit 859624f26c14da6b1ca286c0266ebe9d8759f2de
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jan 2012 09:30:22 +0800
Tag:    v2.2.2

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

commit 10c3c6d49cb0f56b637984fffb0f7e4a122e72a1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jan 2012 09:26:36 +0800
Tag:    v2.2.2

Merge branch 'MDL-31019_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit da744e0065cfe21c4f283a7b3080dd3888edb202
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jan 2012 11:12:38 +0800
Tag:    v2.2.2

Merge branch 'w02_MDL-31005_m22_contextlevelname' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 5dff4c565fe598358f640e127639bec88148377a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jan 2012 09:03:00 +0800
Tag:    v2.2.2

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

commit 995294dfa37a42fa237e8e08a86e6a1a2e5cb23e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jan 2012 08:48:37 +0800
Tag:    v2.2.2

Merge branch 'w02_MDL-30928_m22_deletetimes' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit cef1e7f444b47cc1b3924868a765368691456f82
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jan 2012 08:02:21 +0800
Tag:    v2.2.2

Merge branch 'w02_MDL-30969_m22_suspendedcsv' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit ade2e5955ea78b1d9941532a222068cb79814135
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jan 2012 07:00:22 +0800
Tag:    v2.2.2

Merge branch 'MDL-30652_m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE