Git merges in Moodle 2.2.3 by Sam Hemelryk

commit f818719f117a6a0c0c40dc00e4f93700225fc3be
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 May 2012 11:14:28 +0800
Tag:    v2.2.3

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

commit 93af314f7895cf413ea3b63bd5e423b1c6f68c84
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 May 2012 07:45:57 +0800
Tag:    v2.2.3

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

commit a1f173f7743c78bf882a339fb996b366a1ee10bf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 May 2012 07:31:40 +0800
Tag:    v2.2.3

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

commit f4e4ac8c59c7767ded9e3b26755225a758d0245c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 May 2012 14:06:52 +0800
Tag:    v2.2.3

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

commit 329920fa2260d8a7ba1326ecdbc8725f3d97ebf5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 May 2012 13:41:52 +0800
Tag:    v2.2.3

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

commit d0eeb25a6478c630f744ddcfa68230cbcc471fdd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 09:33:53 +0800
Tag:    v2.2.3

Merge branch 'w18_MDL-32607_m22_upgrade2' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 0ee1c3db00e17e89e81f390232ddf6c4883358e9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 09:17:12 +0800
Tag:    v2.2.3

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

commit fc3a00dc64447eb71e5f74b382e3a581c50b4d90
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 08:37:42 +0800
Tag:    v2.2.3

Merge branch 'MDL-32012_m22' of git://github.com/merrill-oakland/moodle into MOODLE_22_STABLE

commit 44835cdc8b9676ca1f328d6533d29040d3a6d028
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 04:23:48 +0800
Tag:    v2.2.3

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

commit 3464845868243a5a9d37af18f3a475c57fe38297
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 09:21:49 +0800
Tag:    v2.2.3

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

commit 390c3bc54a16f1e427d2813e8ed290273cb9cedd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 09:15:03 +0800
Tag:    v2.2.3

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

commit ead5f3793b1e1ba20ccb85c422b56b32998fc73e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:46:37 +0800
Tag:    v2.2.3

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

commit b5907a8674c7a56358346084509204944e2ab018
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:33:40 +0800
Tag:    v2.2.3

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

commit 8a8f68ff976e8059f14d14713f3f519e91f447f5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:11:12 +0800
Tag:    v2.2.3

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

commit b969338742d41c268226d7ef99c7c9f3b06eb131
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:02:50 +0800
Tag:    v2.2.3

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

commit ba69b6952a9dfc5d9af231506ccb45d097841d77
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 07:57:26 +0800
Tag:    v2.2.3

Merge branch 'MDL-32624_22_wip' of git://github.com/grabs/moodle into MOODLE_22_STABLE

commit 5335b7deb828d5ce79e2a1bfe9fa020eb17924c5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 13:37:04 +0800
Tag:    v2.2.3

Merge branch 'MDL-29174_MOODLE_22' of git://github.com/raymanuk/moodle into MOODLE_22_STABLE

commit 80bc3d98800e86aec55917e41f16a3dd1b1c558b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 13:06:09 +0800
Tag:    v2.2.3

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

commit 4a979297aa389604b95f28a98ada4038065e4f3d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 11:59:38 +0800
Tag:    v2.2.3

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

commit 11990142b0fddba131b7cd1e781c4c3da12c3c67
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 11:11:59 +0800
Tag:    v2.2.3

Merge branch 'MDL-32353_m22' of git://github.com/merrill-oakland/moodle into MOODLE_22_STABLE

commit 0656d45fbcdbcfa23515480f18ddea8b656604d1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 08:23:10 +0800
Tag:    v2.2.3

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

commit 98a4be51768976022a63876ea40b60d09695ee49
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 07:45:36 +0800
Tag:    v2.2.3

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

commit 77b300ca5184d283f9d9c2b5dacdd5d9b44644f8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 07:34:26 +0800
Tag:    v2.2.3

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

commit cb36e6ba4ab9e130c0d4d73003bd05551839b4ba
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 07:00:25 +0800
Tag:    v2.2.3

Merge branch 'MDL-32316_22_wip' of git://github.com/grabs/moodle into MOODLE_22_STABLE

commit b182c1238ef4d42e8bad2539089aa7cc35be21c6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 06:47:58 +0800
Tag:    v2.2.3

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

commit ec01a02d8b8092c3ae782f2b53ad4edd6dd02af8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 13:11:57 +0800
Tag:    v2.2.3

Merge branch 'MDL-32124_22_wip' of git://github.com/grabs/moodle into MOODLE_22_STABLE

commit b054ead121779a944a3d59668a2949c7cb182f2c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 07:01:37 +0800
Tag:    v2.2.3

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

commit 3f046db1501da3b9b047cb3b3e8fb5c59aff8096
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 06:53:19 +0800
Tag:    v2.2.3

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

commit d9cc6b7a31cb95bd8f68b8fe3e5007541827e21b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 06:48:15 +0800
Tag:    v2.2.3

Merge branch 'w15_MDL-32263_m22_enroladmin' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 729ef697055379ea51e2e59b5b6bb74817579f85
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Apr 2012 04:21:52 +0800
Tag:    v2.2.3

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

commit f65eadd42db932e9eb63dbd2dda8737f954df9b5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Apr 2012 06:32:53 +0800
Tag:    v2.2.3

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

commit 2de2d0d2cd9e6dffdfa50062b77428d3a361fadb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 10:31:08 +0800
Tag:    v2.2.3

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

commit 0292c465fe726f36c647b7888e1c99241bf0489f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 07:27:55 +0800
Tag:    v2.2.3

Merge branch 'MDL-32256-cron-return_22_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_22_STABLE

commit 12376c971f543a69f80acd1f74ba9b59e5e0eb90
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 07:24:41 +0800
Tag:    v2.2.3

Merge branch 'MDL-32258-data-cron_22_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_22_STABLE

commit fc0acdfacda1a5e5e7444101aa7898c1c752b9a7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 06:16:20 +0800
Tag:    v2.2.3

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

commit ec202ddbbab08e8f219de04671215499af16864d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Mar 2012 06:03:08 +0800
Tag:    v2.2.3

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

commit 015c334a7303be4d0c9cf465efc6c0524a26a71b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Mar 2012 04:51:28 +0800
Tag:    v2.2.3

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

commit 2733a8c4d592f56058a155fd473bb8807c28c25a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Mar 2012 06:57:29 +0800
Tag:    v2.2.3

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

commit abdbeec6bb873b6deb8e434a04f6d228ac819475
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Mar 2012 06:19:27 +0800
Tag:    v2.2.3

Merge branch 'MDL-29400' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit 292f509cfff0ef8d7c0a8d9734f7c71db14bfb1d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 23 Mar 2012 07:11:03 +0800
Tag:    v2.2.3

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit 89399cb129f8e5aa677352b911a69a7c521c9d64
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Mar 2012 04:50:13 +0800
Tag:    v2.2.3

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

commit 0d2001b756190b31ab4d73affc234e0fce633865
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Mar 2012 04:29:12 +0800
Tag:    v2.2.3

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

commit dff9c69fa8a5023795ee4c3eeb8c591de847e5db
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 08:41:20 +0800
Tag:    v2.2.3

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

commit 26777ab2c382207a9edb869010708add6a0bf029
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 08:33:17 +0800
Tag:    v2.2.3

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

commit e9d7fb3a8881318ccbfe594b1903464ba9d8bf51
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 06:40:01 +0800
Tag:    v2.2.3

Merge branch 'w12_MDL-32071_m22_dbfamily' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit e6c9fdb384005d729b4be278d1f97eebb6d76140
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 06:34:09 +0800
Tag:    v2.2.3

Merge branch 'w12_MDL-32079_m22_folderrev' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 33ce9928d89c9e329e083c45d37d48aece28cc96
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 05:37:27 +0800
Tag:    v2.2.3

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

commit 2cd9cfcc974aa364f217c80da79e3962f740d74c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 15:38:14 +0800
Tag:    v2.2.3

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

commit a440a25c64754b809e929e0db847dff651df20c0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 15:33:38 +0800
Tag:    v2.2.3

Merge branch 'w12_MDL-32090_m22_groupui' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 56f55380a9c97fc2dd772db07ec5168219d510c7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 15:06:28 +0800
Tag:    v2.2.3

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

commit 8b66d25681e7b6688c39d3aa9cfbc586858a08ab
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 10:48:52 +0800
Tag:    v2.2.3

Merge branch 'wip-MDL-27064-stable22' of git://github.com/phalacee/moodle into MOODLE_22_STABLE

commit fc109fac2dc9ec604bffb2de8ea7ff841995af64
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 09:14:17 +0800
Tag:    v2.2.3

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

commit 3905c1f75b3fa07426049d13ad4345b0723e8475
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 09:07:05 +0800
Tag:    v2.2.3

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

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

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

commit b87ca9b7132293a1b78454f7362905fc8368ed54
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Mar 2012 09:39:59 +0800
Tag:    v2.2.3

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

commit 999e6901c86899d8535b14b733204e1591aca335
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Mar 2012 06:30:06 +0800
Tag:    v2.2.3

Merge branch 'MDL-29440' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit 22dde645f4de78e0d59c43d1c3cfa2fed2d414a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Mar 2012 06:59:53 +0800
Tag:    v2.2.3

Merge branch 'w11_MDL-27457_m22_enrolnorecover' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit d254ae8cfe229bf2c999f047259d06e77f84f530
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Mar 2012 06:56:18 +0800
Tag:    v2.2.3

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

commit ec2b87aede6bd0acce391a4571d30c9c0ece9a45
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Mar 2012 05:33:39 +0800
Tag:    v2.2.3

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

commit b3fe3fb6c8b0b7f51d566775ead551c10a0733e5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 12:29:11 +0800
Tag:    v2.2.3

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

commit 25ff180756b1cdbbe96f69af0906c8afa9180072
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 12:05:21 +0800
Tag:    v2.2.3

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

commit cbb8087b306ae967a2604f212e2ba7ea84905966
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 12:02:07 +0800
Tag:    v2.2.3

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

commit 840dc3cb947313953bee9092ef4116e4441d8b04
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 10:26:21 +0800
Tag:    v2.2.3

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

commit 7ac10ac609a1978d10b5481d5ec8aaafe4fce2ce
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 09:22:10 +0800
Tag:    v2.2.3

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

commit 113b864ffc71da7b594a958be40d9dc345e25ba2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 09:19:50 +0800
Tag:    v2.2.3

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