Git merges in Moodle 2.2.1 by Sam Hemelryk

commit ffd621215212088b6f70a99e5466c84a7bef69d4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 05 Jan 2012 06:17:13 +0800
Tag:    v2.2.1

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

commit cd735560d34042aeba31b3f2d468ab5228b8bb40
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 11:35:26 +0800
Tag:    v2.2.1

Merge branch 'w52_MDL-30786_m22_todelete' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 1243bf814b7fb121c8767e7d59f9b94dcf9f254b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 06:25:50 +0800
Tag:    v2.2.1

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

commit e972cdc5adf7cac492d4b426c746b4e20a31be27
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 06:23:00 +0800
Tag:    v2.2.1

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

commit dc8d309c883d9ac656ab50bcf6678a7160d41d78
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 06:14:10 +0800
Tag:    v2.2.1

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

commit 860848dca8974b023a7a43ac8437eb30cf2d5ee9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 06:12:01 +0800
Tag:    v2.2.1

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

commit 7f7d9ce6e88493113b264350f2ef79f51358bb8f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 04:57:14 +0800
Tag:    v2.2.1

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

commit e0c00395b7c18b9a30f92c751a5072b0e843b8c5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 22 Dec 2011 06:44:34 +0800
Tag:    v2.2.1

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

commit 965344c08f273ffd3b286d6f965f554fb7da10e9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 22 Dec 2011 06:21:08 +0800
Tag:    v2.2.1

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

commit 6ff99dde45e9d9153989d5d63ae822148dc21523
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Dec 2011 10:00:41 +0800
Tag:    v2.2.1

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

commit db65026449cf7e443303d4b0190fdcf98dfaaafa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Dec 2011 09:30:27 +0800
Tag:    v2.2.1

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

commit 0cba7c0408f54453c61170cc1831291b22491038
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 09:15:43 +0800
Tag:    v2.2.1

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

commit 9f83ba0887bd0ed0cc7ea9bd86e0eed9a743cfe4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 08:34:53 +0800
Tag:    v2.2.1

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

commit 6005434b55c2ec09da8644a8601cf8ff9086d39c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 08:21:11 +0800
Tag:    v2.2.1

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

commit a8fb78b14245885a4394297ccabd92f2f71f7d37
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 08:16:20 +0800
Tag:    v2.2.1

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

commit b3af6c110ae016403a809c9f2d02e14c3f2bb084
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 07:08:09 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-30787_m22_coursemodedit' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 4e77491aff2791e7817a3d4e535f41a211c4956b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 05:42:45 +0800
Tag:    v2.2.1

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

commit 1f3933bee6010d5b2f8a2e75423435bef59fd928
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 05:09:27 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-30765_m22_context' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit e7af814b0d36c64c889057f82a0d7208fe634490
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 05:03:59 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-30697_m22_roleslink' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 415be0ff9410d5a6fe8c30685bdd998857581b4e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 11:26:01 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-30789_m22_enrolupdatestatus' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit d613d7d78e5f50ca49b134573707624c426f4347
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 10:05:42 +0800
Tag:    v2.2.1

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

commit 7c19940ca6843bf004e79f47b6901dd99716d074
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 09:14:55 +0800
Tag:    v2.2.1

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

commit ead158db7e96b67edde692262c3d57cd35a4ac76
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 07:23:36 +0800
Tag:    v2.2.1

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

commit 3bcb2c1dff99a0869b24e16bb35528c3a381d5e8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 06:52:32 +0800
Tag:    v2.2.1

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

commit 265dbb3a54ae80744bef3de28b1d0b7b4df5a04e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 06:30:42 +0800
Tag:    v2.2.1

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

commit 2253ea25926d0093fde9f6d45fa6dc071cf90ea9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 05:53:57 +0800
Tag:    v2.2.1

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

commit 5ff8144cc8ad3e8c7a025617310e8ea674c64656
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 04:28:10 +0800
Tag:    v2.2.1

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

commit 83688ab542c67409f66d4196fb3b33779986733e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Dec 2011 12:17:29 +0800
Tag:    v2.2.1

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

commit d4b584c5f6cd739a13cdcacf6231d83947bf8129
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Dec 2011 09:25:17 +0800
Tag:    v2.2.1

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

commit 2f24a39b5ba86b7f953c988bc541dc59e6d8cb47
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Dec 2011 09:08:21 +0800
Tag:    v2.2.1

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

commit b3463f416c72287dd11c32f7ea5de05f5613c968
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 06:20:04 +0800
Tag:    v2.2.1

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

commit fc97bb98637f736728c549b2fdcc8f75994a39a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 06:15:08 +0800
Tag:    v2.2.1

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

commit 8c495ea4ee66d1c43dae1766386d3a3877658ccb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 06:11:21 +0800
Tag:    v2.2.1

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

commit bb0ece5a0c411828624dd47e810c43a247e57236
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 05:26:31 +0800
Tag:    v2.2.1

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

commit e79c09855ca853fab61d88b3f8d2a71e1fc8411b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 05:17:56 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-30621_m22_protectdir' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 860f7f919526880f42541e8d19127ab396a01da2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 12:59:24 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-29117_m22_enrolnewcourse' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit a3a3186770787fca49403a4b152ca3868be22e37
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 12:41:00 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-30292_m22_health' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 424f91c056bf4d57770f601174f4a07aef458740
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 12:37:39 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-30364_m22_report' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 653599b3a4918f699bc4c3ddbd6ab3eebdd1c9f1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 12:14:58 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-30588_m22_switchrole' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit ba9489ce912fb4b8fcc463aa43eefa6a5762210e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 11:37:03 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-30659_m22_yuidebug' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 6aabb69f9e593aa3e1c18ad9379f04dadb828058
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 11:10:19 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-30687_m22_ldapnewcourse' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 02af5654f2cb15105d79fc1bbe9c2be1ca500951
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 10:13:01 +0800
Tag:    v2.2.1

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

commit 4e8da675ac5ae0761aff112a7dcd9663be75f06c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 09:56:40 +0800
Tag:    v2.2.1

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

commit d3054582d5738a6d76ea357f49b396562e69dd3a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 08:57:40 +0800
Tag:    v2.2.1

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

commit e0745be16b7a684c257a34ccd7bed187ef57ecb0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 09 Dec 2011 06:43:41 +0800
Tag:    v2.2.1

Merge branch 'MDL-30660' of git://github.com/timhunt/moodle

commit 78baf38ea4d9de59157a9a57de93c466bf9b5de2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Dec 2011 11:05:08 +0800
Tag:    v2.2.1

Merge branch 'MDL-30518' of git://github.com/mackensen/moodle into MOODLE_22_STABLE

commit a33d85b3744b55ca085c75e3dcbd2b650cccb7a5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Dec 2011 08:50:03 +0800
Tag:    v2.2.1

Merge branch 'w50_MDL-30623_m22_guest' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit b1d4c42ad698b45700b2cc6e1d830b91d3913b6f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Dec 2011 05:22:58 +0800
Tag:    v2.2.1

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

commit 7f96df6222e9fb1500843beafdffee410e5f96c2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Dec 2011 05:19:22 +0800
Tag:    v2.2.1

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