Git merges in Moodle 2.1.6 by Sam Hemelryk

commit 9c0f9c588e64005a0b61553aeb69022fcf0d4f1c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 May 2012 11:14:19 +0800
Tag:    v2.1.6

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

commit 4997ac9e2ff571a71fdc640544b01d7d7b262041
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 May 2012 07:31:24 +0800
Tag:    v2.1.6

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

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

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

commit 8296031c1f1b2e0b08b05f0f07240da3ad9b979e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 May 2012 13:41:44 +0800
Tag:    v2.1.6

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

commit b702373a4d2bc0d232df81fabbb858cb00ee50c4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 May 2012 13:51:03 +0800
Tag:    v2.1.6

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

commit ba5f2ec6639db3ed834756b03e004858d1cdfa34
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 09:16:54 +0800
Tag:    v2.1.6

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

commit 7299a9e288909b8fd773da888a5f6388a89af87f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 08:37:21 +0800
Tag:    v2.1.6

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

commit 817d9328aeee2e2ae0f40a6e13cf9d38f306e1ac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 04:23:45 +0800
Tag:    v2.1.6

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

commit d8317f0a40489d9922a257c2e97f0f2f4103c8c2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 09:21:45 +0800
Tag:    v2.1.6

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

commit dd3dc2e2e3822d300a9c899a06a1b0f114171fed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 09:14:54 +0800
Tag:    v2.1.6

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

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

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

commit 60aaa96f61b782ba5ccf7cccd85fa31e18e06002
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:11:05 +0800
Tag:    v2.1.6

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

commit 8374754563129da8dddb6b1bbe9eac5875053c50
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:02:42 +0800
Tag:    v2.1.6

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

commit 45bfe330eaccdb3eb39b4d22e6475f0f556dc1d5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 07:57:18 +0800
Tag:    v2.1.6

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

commit b83306c0ce65aaf3c19e8557640a4d32a07b794f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 13:06:03 +0800
Tag:    v2.1.6

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

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

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

commit f0c351f7632f9cbff4026781d7a0bc59a221ddab
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 11:09:21 +0800
Tag:    v2.1.6

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

commit 50ff77d26a68250865776d42c71a3be3760d0572
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 08:23:02 +0800
Tag:    v2.1.6

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

commit 0eeb0874cc29c1f3dace37c5de652ef9f9cb9c97
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 07:45:29 +0800
Tag:    v2.1.6

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

commit 6535721cebaec187dfc968eecfe2bfc528aeb686
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 07:34:18 +0800
Tag:    v2.1.6

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

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

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

commit 84aabeae85aee8e6c6cad12601146c6b9b249761
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 06:46:37 +0800
Tag:    v2.1.6

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

commit 365e69b47dfb11c81d9ec6a1aa8118382df70529
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 13:11:49 +0800
Tag:    v2.1.6

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

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

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

commit 56e270e11ed5ae2dfb01ea6814beca982f2e9b1d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 06:53:12 +0800
Tag:    v2.1.6

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

commit 3e14545d2d05c11d678f435d5859697b4a93f7e6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Apr 2012 06:32:33 +0800
Tag:    v2.1.6

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

commit 6931d5408532aec94af33e261cd0724ebedc0b7c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 10:31:01 +0800
Tag:    v2.1.6

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

commit 50cc39f9503b8d08177709a6bc55f5ff3abb8f14
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 07:24:16 +0800
Tag:    v2.1.6

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

commit c185ac18f59170f7cf08217f45fa64d1de0dbcbe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 06:15:41 +0800
Tag:    v2.1.6

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

commit c4d72072dc0e074e63c67aa1bf23d9a2ab4245fc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Mar 2012 06:02:53 +0800
Tag:    v2.1.6

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

commit 88ead1b9ff452ae08583a52ddc6f8d30483da7f3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Mar 2012 04:50:19 +0800
Tag:    v2.1.6

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

commit 8a4aa94daf2232fe13e3c086b56172e8e4affac7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Mar 2012 06:57:20 +0800
Tag:    v2.1.6

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

commit 0982968a37e89fb91d060236509507dd0eceef36
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 23 Mar 2012 07:10:44 +0800
Tag:    v2.1.6

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit a7dedc5efee57f33bdee8194f42f8ab8009d0039
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Mar 2012 04:50:20 +0800
Tag:    v2.1.6

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

commit 7ad20028b0cb3417320e0560507a3fe33156d38f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Mar 2012 04:29:03 +0800
Tag:    v2.1.6

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

commit e5f9484e46c6edce4d4ad4edf9caba1802e40747
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Mar 2012 04:24:38 +0800
Tag:    v2.1.6

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

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

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

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

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

commit a11492d7e8918e47e45911020857a82b3c9d7a06
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 06:39:43 +0800
Tag:    v2.1.6

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

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

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

commit 2aab431486f949c098ecbf1f0fd48cde8e04ea61
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 05:37:20 +0800
Tag:    v2.1.6

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

commit 2849965662b76e66164dee1905c4299df8f372db
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 15:38:05 +0800
Tag:    v2.1.6

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

commit 9231ed5d793a596e42f697abfcdd5b94640aa907
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 15:33:31 +0800
Tag:    v2.1.6

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

commit 265724046dab6f9e0b8707bff3c9b272cf8ad0d7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 15:06:20 +0800
Tag:    v2.1.6

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

commit ed8561171506f5802ad8e50f6ffb61aeb7d18619
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 14:10:59 +0800
Tag:    v2.1.6

Merge branch 'MDL-31984_theme_renderer_file_debugging' of git://github.com/ualberta-eclass/moodle into MOODLE_21_STABLE

commit 70a63a726db937d61c45cd8c08e6a6ee115e6213
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 10:53:56 +0800
Tag:    v2.1.6

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

commit 9ac6d34dbd2d451338c29cfd18f3a46cbb9f9fb8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 10:48:37 +0800
Tag:    v2.1.6

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

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

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

commit 5a7722e046a2fdb4196bce4fa68d44878b83d03f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 09:06:43 +0800
Tag:    v2.1.6

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

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

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

commit 3d9dff0f229c269d7bf3d6f127bef8d311ef46c9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Mar 2012 09:39:51 +0800
Tag:    v2.1.6

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

commit 40ba373443cd315128343f09ea5c993ab9d528c2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Mar 2012 06:30:21 +0800
Tag:    v2.1.6

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

commit 63f4993e4a8b76ea706415ba94191dcaf2431767
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Mar 2012 06:59:44 +0800
Tag:    v2.1.6

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

commit 449fd68024a5fcc312e3d027f36ae0c3d67621c6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Mar 2012 06:56:27 +0800
Tag:    v2.1.6

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

commit 421a8533c558db1037148fdd25181b8cc05bb668
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Mar 2012 05:33:16 +0800
Tag:    v2.1.6

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

commit 06a31cb7b859daa131682565e962f0e44d185bc0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 12:34:23 +0800
Tag:    v2.1.6

Merge branch 'wip-MDL-27087-stable21' of git://github.com/phalacee/moodle into MOODLE_21_STABLE

commit 81dc3b5fd5e25828370e23320bbe927eae02d2a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 12:05:12 +0800
Tag:    v2.1.6

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

commit 5c3f51714218126fc03702b722f1cea5d42f1cb7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 10:18:13 +0800
Tag:    v2.1.6

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

commit 256e3edf0ef84d6624a4605cec342c809200a5ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 09:32:45 +0800
Tag:    v2.1.6

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

commit df3a3b45da0afe57bdfcf0944b3c91abc1beaad5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 09:22:02 +0800
Tag:    v2.1.6

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

commit 06dd9ad0d85f890e0fee2bce1bde8ff24c217380
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 09:19:42 +0800
Tag:    v2.1.6

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