Git merges in Moodle 2.1.x by Sam Hemelryk

commit c54cd379ac317dfa325fbc170f57b6887bad2c22
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 08:09:06 +0800
Tag:    v2.1.8

Merge branch 'MDL-29470-21' of git://github.com/FMCorz/moodle into MOODLE_21_STABLE

commit 5c89dd5d186f1f0d2d9e49296c4fb7e00d004299
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 06:28:26 +0800
Tag:    v2.1.8

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

commit 67fb1b666e10af499a6b5b4d0178397857a02adc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 06:21:47 +0800
Tag:    v2.1.8

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

commit 0ac34abbfbdc1847c9121bae3b3efd675072bafe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 06 Jul 2012 05:49:24 +0800
Tag:    v2.1.7

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

commit 7d7f36787bf1bddfd7a0f59a94b41882e31f3583
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 05:53:32 +0800
Tag:    v2.1.7

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

commit 17a759cf6111484291f3c77e4ae05efdffc17e57
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 04:41:26 +0800
Tag:    v2.1.7

Merge branch 'wip-MDL-33749-MOODLE_21_STABLE' of https://github.com/kwiliarty/moodle into MOODLE_21_STABLE

commit 30cab618e1c51b992b4215fe6191b9ab744277f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 10:57:14 +0800
Tag:    v2.1.7

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

commit 75aa150051eb95cedde699102d3af1e8c86124a7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 07:47:58 +0800
Tag:    v2.1.7

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

commit 40f00ad784d6ca83abd0706bfdc10e2e1f62e017
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 10:31:32 +0800
Tag:    v2.1.7

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

commit 45181b1553aafd9423a40f030eae9dd67b6c8d14
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 10:05:42 +0800
Tag:    v2.1.7

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

commit e2f3b1eea1a6487c64fdecbe62ab92a6e88fb879
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 04:22:10 +0800
Tag:    v2.1.7

Merge branch 'MDL-34044-21' of git://github.com/srynot4sale/moodle into MOODLE_21_STABLE

commit a4c4e43a5f7476ea3c823caa7671d1739c8a8bae
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 21 Jun 2012 07:36:42 +0800
Tag:    v2.1.7

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

commit d25f6b810490fb3e4b5ba82e80d0fdbb47fea187
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 21 Jun 2012 06:06:24 +0800
Tag:    v2.1.7

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

commit 54e24c11a59f213c65dfe8d06ee5e9ea76bcc1a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 08 Jun 2012 06:20:31 +0800
Tag:    v2.1.7

Merge branch 'MDL-32325-21' of git://github.com/FMCorz/moodle into MOODLE_21_STABLE

commit c2cf907f3f5c58cd0e860dc2c85501724f0d60ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 11:24:03 +0800
Tag:    v2.1.7

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

commit bed0c7a63ef8ed93b8f55095fa0ccb4383a25c39
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:59:34 +0800
Tag:    v2.1.7

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

commit 4c3a1c6f8a6e08d921d91d8ee5592a31d0b2de70
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:37:48 +0800
Tag:    v2.1.7

Merge branch 'MDL-31520-MOODLE_21_STABLE' of git://github.com/fabiomsouto/moodle into MOODLE_21_STABLE

commit 8ad117cca866e4d3385ddaa211f12cbb96098207
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:13:32 +0800
Tag:    v2.1.7

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

commit 7d4c5ac5ab77d729362563576d5b83d5bd0faa4f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:09:45 +0800
Tag:    v2.1.7

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

commit ded3134c3766bb7b7f03ac7f52e2caab2b91d000
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:05:57 +0800
Tag:    v2.1.7

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

commit bc1f0e0b405ffc75a96a67b11e429a41c1d34ead
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 05:07:07 +0800
Tag:    v2.1.7

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

commit 27ee2b673775dc736f87c2974b2d286a0e726c76
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 09:51:01 +0800
Tag:    v2.1.7

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

commit 9c96488ed967a5923fd082ab9b30cab9409f99ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 07:44:07 +0800
Tag:    v2.1.7

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

commit b22884274f8e7729c5a9145b3b355fb1d4b03527
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 07:21:45 +0800
Tag:    v2.1.7

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

commit ab833c6ee4634cf67bd688eeb7780267c58cf013
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 06:52:03 +0800
Tag:    v2.1.7

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

commit ebbf509960fcb0c53d2b39d2fae551d2711c5c9c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 May 2012 07:23:59 +0800
Tag:    v2.1.7

Merge branch 'MDL-32203c-21' of git://github.com/srynot4sale/moodle into MOODLE_21_STABLE

commit e09266d176f1af06d2614333c957f68e77750c7d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 May 2012 06:56:06 +0800
Tag:    v2.1.7

Merge branch 'MDL-26562-21' of git://github.com/vadimonus/moodle into MOODLE_21_STABLE

commit d7bce7db814d03a326128c4174b94468382a7e64
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 May 2012 10:49:07 +0800
Tag:    v2.1.7

Merge branch 'MDL-32204-mnet-auth_21' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit e76f4039b98a1c7697443e5bc1e4a4e9dad58036
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 May 2012 10:42:10 +0800
Tag:    v2.1.7

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

commit 2dfeb89f48fc68c241033a024aafabdc111f42b2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 May 2012 08:27:17 +0800
Tag:    v2.1.7

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

commit 25f8be6e70b4f35a7d1c69afd3ddce2ee0ea547a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 May 2012 05:11:59 +0800
Tag:    v2.1.7

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

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

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

commit aa6d8f0f75ee9a9e9b9ef479b0d20bbc6160d2d5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 05 Jan 2012 06:16:58 +0800
Tag:    v2.1.4

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

commit b1a17fadcfb79148b4c5ac71d76ece104003a9ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 06:25:40 +0800
Tag:    v2.1.4

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

commit 1ed9377e7841b96dc957cd615415e07370f3950f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 06:22:50 +0800
Tag:    v2.1.4

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

commit 9b82d1b4d4116bc6524379fccb97fb6b7d894854
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 06:14:02 +0800
Tag:    v2.1.4

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

commit 19bfd159974921fab5a9f4021146a02395073c4b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 06:11:53 +0800
Tag:    v2.1.4

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

commit 39f8f2e181cacd24e411a7994a4aeed30fcae1dc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 04:57:23 +0800
Tag:    v2.1.4

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

commit 98b05c1ca7df7cae4070a8875e904772bfc0cdd5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 22 Dec 2011 06:45:06 +0800
Tag:    v2.1.4

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

commit 4703fb429edd036895bee3679c2c7a5ea71bb2da
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 22 Dec 2011 06:20:56 +0800
Tag:    v2.1.4

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

commit 50a1735fe4b1e8aa21e13a394a32b47550d4687d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Dec 2011 10:00:57 +0800
Tag:    v2.1.4

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

commit a2aa081e73994dc96aaa2149fb68490ba0d422c9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Dec 2011 09:31:02 +0800
Tag:    v2.1.4

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

commit 7d97d3ac7e9362fee00f6a6ebce42bd378417092
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 09:15:35 +0800
Tag:    v2.1.4

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

commit 0e9c5fbc89f5eddf5631fa35c1eca353d18731eb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 08:34:37 +0800
Tag:    v2.1.4

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

commit 57648d8d765e4da001e55032016a6a952d256e7e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 08:20:57 +0800
Tag:    v2.1.4

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

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

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

commit 490f178f04781e6eabd6a4e3cd4162153fd1c507
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 05:42:30 +0800
Tag:    v2.1.4

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

commit 16e8ccaf5f40734c17107027bf2b4797cecacc11
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 05:05:18 +0800
Tag:    v2.1.4

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

commit 3969853b1c10a4020306772c6be57363f1b387c8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 10:05:20 +0800
Tag:    v2.1.4

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

commit 0bc0394c8ffaaadfc4c46e974bd85529e1ae53d4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 09:14:14 +0800
Tag:    v2.1.4

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

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

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

commit dd98ec697cbf2dea8ce43927a3e87b2258d8d76a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 06:52:17 +0800
Tag:    v2.1.4

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

commit 0006e0cfa13c883420b0dda429294292c4696f82
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 06:30:23 +0800
Tag:    v2.1.4

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

commit d854866de39dc3e3e088bbb71191e7b0a7314707
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 04:28:23 +0800
Tag:    v2.1.4

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

commit c5a4b44be6069535c7873d90bc293cc35c2c479e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Dec 2011 12:17:44 +0800
Tag:    v2.1.4

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

commit 0bb848f74ce46bd0dbc3edba696bcbe29546ca37
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Dec 2011 10:29:40 +0800
Tag:    v2.1.4

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

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

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

commit 3d2ac8024d3311619caf6ea39c94b48abf93ee45
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Dec 2011 09:08:07 +0800
Tag:    v2.1.4

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

commit d380faef5cd9f421dd15d90e9c40b925261f1f52
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 06:19:51 +0800
Tag:    v2.1.4

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

commit e66237cdcf8e2fbd0da49ee42040828759e72f8f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 06:14:54 +0800
Tag:    v2.1.4

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

commit c50442d0d7e93fbad9e96ae68a3675bcc82d091e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 06:11:07 +0800
Tag:    v2.1.4

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

commit 8d70e5cc74e463311fa91c4615929d2e55d69e54
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 05:26:11 +0800
Tag:    v2.1.4

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

commit 860551428c35d226e3752efbe139e7b47b4c9760
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 12:15:16 +0800
Tag:    v2.1.4

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

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

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

commit 16a6377ca8f9ea9c6bbbb9e279157178d24fc072
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 10:13:21 +0800
Tag:    v2.1.4

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

commit 1ac4f0edbcf1cea05f22d4a85cc84e350f96f86f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 09:56:52 +0800
Tag:    v2.1.4

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

commit 494b8a8596fed2f1f3dc4f0fc31ff2df068fec02
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 08:57:23 +0800
Tag:    v2.1.4

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

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

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

commit 2fbbfb0187de0fcc9677f2e24f10c0384bcbd936
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Dec 2011 07:41:59 +0800
Tag:    v2.1.4

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

commit 8305bb680fc3ac6fa7d6005eca22afeb4e3c97d8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Dec 2011 05:47:43 +0800
Tag:    v2.1.4

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

commit effe15308bed53e90be205fd551bddf41049ac91
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 07 Dec 2011 09:20:15 +0800
Tag:    v2.1.4

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

commit 40f4b5c562a83f3c4da410d7886d5a7a31363211
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 07 Dec 2011 07:38:51 +0800
Tag:    v2.1.4

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

commit 280dc8bd45c57b17130769fcdb9e67a2269d70c4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 10:48:56 +0800
Tag:    v2.1.4

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

commit be4ee6dcb1f5779b7c993c3237097e0313397fe9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 10:19:32 +0800
Tag:    v2.1.4

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

commit 71f5d75a463e4bbbbd4b4627737172df7ee3e4c8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 07:29:38 +0800
Tag:    v2.1.4

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

commit fd2aab6c9df59c1ccba64176bdc7f3138635c08b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 07:16:02 +0800
Tag:    v2.1.4

Merge branch 'MDL-30453-exassessment-link_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit 494b6c9e395bda6d3b07393c6c30c8bb525ff3ee
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 06:49:45 +0800
Tag:    v2.1.4

Merge branch 'MDL-30271-switch-role-workshop_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit 7708c82e72a8f9c1a3cfbd809c0546a51be0e54e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Nov 2011 06:44:20 +0800
Tag:    v2.1.4

Merge commit 'FETCH_HEAd' into MOODLE_21_STABLE

commit 2fff9611fa4cae6fb0f203c1e04de2c686acbac2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Nov 2011 06:37:36 +0800
Tag:    v2.1.4

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

commit d21cf5744d39285a265001c2dee088d25da4d009
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Nov 2011 11:40:16 +0800
Tag:    v2.1.4

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

commit c3689810d5e9742938a6bfd3af8a930a63d63bc7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Nov 2011 13:55:22 +0800
Tag:    v2.1.4

Merge branch 'w48_MDL-30448_m21_urlpar' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 1ed6756d80ac935ce9d046551a383559be59a80f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 25 Nov 2011 07:44:39 +0800
Tag:    v2.1.3

Merge branch 'MDL-26431-21' of git://github.com/totara/moodle into MOODLE_21_STABLE

commit c3ef0a618dd97558e31e74d258a2f109f9181991
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 25 Nov 2011 06:59:18 +0800
Tag:    v2.1.3

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

commit 3174abc728a305ec5638cec116f22b98bb444ad4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 25 Nov 2011 06:36:26 +0800
Tag:    v2.1.3

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

commit f99bd07ab6a48465d899d895777ec2a62db22fe6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Nov 2011 09:20:10 +0800
Tag:    v2.1.3

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

commit aa1d8c5cdee9f3704a33cb0b63a53317504af3dd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Nov 2011 08:57:38 +0800
Tag:    v2.1.3

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

commit 4236448a19a1837f3cc76e060ac7fcdc4a43cb8d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Nov 2011 13:28:30 +0800
Tag:    v2.1.3

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

commit 27bc2953827ec7114a07f768448a168e7057e220
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Nov 2011 07:59:37 +0800
Tag:    v2.1.3

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

commit 02c43cd86a277471af0bdfe36d1dd5b002fcb94b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 Nov 2011 09:54:27 +0800
Tag:    v2.1.3

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

commit 18b7d189595214b4c62a756ccfc39232a0568ecb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 Nov 2011 08:07:33 +0800
Tag:    v2.1.3

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

commit fcd27b4981a1b7b49aff086c681d1aa9919a3c9a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Nov 2011 12:50:47 +0800
Tag:    v2.1.3

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

commit 2331e2edddd442f5c86f9d198b75da603bcda331
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Nov 2011 08:09:44 +0800
Tag:    v2.1.3

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

commit c2d7c2296209f2be3ae789172a21cc633b03e01e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Nov 2011 07:05:39 +0800
Tag:    v2.1.3

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

commit 3fb3517a002185250af9b70e2e4b9954d7cfba1e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Nov 2011 07:02:59 +0800
Tag:    v2.1.3

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

commit fb09c60c5e22f9818050ee05f715c26686147c4a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Nov 2011 07:24:21 +0800
Tag:    v2.1.3

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

commit ace2712e43ae6b051a7088716231a4e4837843a3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Nov 2011 06:41:25 +0800
Tag:    v2.1.3

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

commit 2acd50840cd2c4655a12cd91bf4091a759147021
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 11:52:31 +0800
Tag:    v2.1.3

Merge branch 'w43_MDL-29980_m21_flowcss' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 9fc8435c2105df5279aaa81b441b297b56a75719
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 11:11:44 +0800
Tag:    v2.1.3

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

commit 685cc34c186f0c93b02a0e8a4ee27f7d4e80405b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 10:58:14 +0800
Tag:    v2.1.3

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

commit 5e56574d5576de23826ef8f94bce29dc78905d3f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 04:38:10 +0800
Tag:    v2.1.3

Merge branch 'w43_MDL-29925_m21_calendar' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 132258428763a61671c1328272755539181a4d9e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 12:31:49 +0800
Tag:    v2.1.3

Merge branch 'w43_MDL-28720_m21_calendarreturn' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 7a6d43a3eeac3e28a62e6ddfe233727afa042fae
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 12:10:41 +0800
Tag:    v2.1.3

Merge branch 'MDL-29810-21' of git://github.com/bostelm/moodle into MOODLE_21_STABLE

commit 376d035af926e6b22c5b90df4a6a4096c12bc00d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 08:05:53 +0800
Tag:    v2.1.3

Merge branch 'MDL-30006-workshop-grades_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit c440076d2b833c1fc2a412facd84b59761d8706f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 08:00:08 +0800
Tag:    v2.1.3

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

commit d612fa300e720e18e60718413b616fd83a1e11d0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 07:56:18 +0800
Tag:    v2.1.3

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

commit 84ac3ff12259ca1fc7e4f02af5fe38bcf9e4925b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 07:44:31 +0800
Tag:    v2.1.3

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

commit 5c6ec457069ed8a460cad94080985d353e4c38cf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Oct 2011 05:44:20 +0800
Tag:    v2.1.3

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

commit 68bbf587456cee5b844b92c21e4f8ba615270a32
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 11:47:03 +0800
Tag:    v2.1.3

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

commit 523f4aa78747ee238bd8ac93988440200e00c9cd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 10:19:12 +0800
Tag:    v2.1.3

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

commit 35e2ec4df5b488ba3575120c2425eaef106c1d1e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 07:25:06 +0800
Tag:    v2.1.3

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

commit 3a87f672b7ae4c949ce8c682c52a89e26502057b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 06:50:10 +0800
Tag:    v2.1.3

Merge branch 'w42_MDL-29862_m21_fullmeinit' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit bc23dbcf78c1ebb11b8806741b50724a8b71b088
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Oct 2011 06:39:24 +0800
Tag:    v2.1.3

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

commit a258bda0b5e3f376838acd3d7a236e3a4aa04619
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 13:51:58 +0800
Tag:    v2.1.3

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

commit f1618d93436e142c53fafad749299c161bd116a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 12:37:16 +0800
Tag:    v2.1.3

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

commit 6adc168c96133fd373ad777173743b90123bfd5f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 11:26:04 +0800
Tag:    v2.1.3

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

commit 24e5f9df630f90371d955c1866ecb3e7f5e99eb0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 10:17:36 +0800
Tag:    v2.1.3

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

commit 297f40838a7ef2de1064881fa6776e4ddf8725d0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 08:55:18 +0800
Tag:    v2.1.3

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

commit 28d838ba5eef9f32edd9a7774d9bcf9ff911e6c5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Oct 2011 05:27:04 +0800
Tag:    v2.1.3

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

commit b1913094d4d0fc253e64a0a791375e762dd239e0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 12:56:58 +0800
Tag:    v2.1.3

Merge branch 'MDL-16553-21' of git://github.com/bostelm/moodle into MOODLE_21_STABLE

commit 63a778838e0e503d1fbfff77e85b570d51d1c0a1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 11:27:04 +0800
Tag:    v2.1.3

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

commit 27625e0fca4723edc20ae73ea56b8cb2cfb22e70
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 09:56:59 +0800
Tag:    v2.1.3

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

commit 7fbb52d71712ae9b3cbe05e69391c18817ae210b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 07:09:19 +0800
Tag:    v2.1.3

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

commit 2a0df645217ebc493636f2575cf2af49b6ce8104
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 07:03:09 +0800
Tag:    v2.1.3

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

commit 430ce6cca3cd4a6355e4f96b6ab3e6fbfe88f5a1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 06:51:08 +0800
Tag:    v2.1.3

Merge branch 'mdl-29564-assignment-plagiarism' of git://github.com/sbourget/moodle into MOODLE_21_STABLE

commit 133173e21384b2f282f3d5ea3676b5e94e6a2a95
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Oct 2011 12:56:39 +0800
Tag:    v2.1.2

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

commit 91a7a788aa2d94b7d716e02f22bc42039696200b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Oct 2011 11:21:33 +0800
Tag:    v2.1.2

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

commit 7d9cb204beb096db3cc30dce0787375b8038e07e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 12:08:51 +0800
Tag:    v2.1.2

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

commit e6f5ebe25bf65b3e8b600e423b83d79181016f60
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 11:43:09 +0800
Tag:    v2.1.2

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

commit 6eeb293e044a9ba00c4bf2b98bd4713fe804eb42
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 10:09:53 +0800
Tag:    v2.1.2

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

commit 69a62c2646c1554f3a8572173238bec446e39e6d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 09:37:54 +0800
Tag:    v2.1.2

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

commit add033dafe0084b577d7766d675752b7e70b2d82
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 09:30:12 +0800
Tag:    v2.1.2

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

commit 90e44b5068226e457e30959737e6b8ab75788900
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 09:24:18 +0800
Tag:    v2.1.2

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

commit bf49e4404ce1e2c89e42397168639fc6ccf0a2eb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 09:04:47 +0800
Tag:    v2.1.2

Merge branch 'MDL-29558_2_1' of git://github.com/jamiepratt/moodle into MOODLE_21_STABLE

commit ddf0d0dcd75aa3d0b7d4a10d7d2f775f1b72f830
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 08:23:24 +0800
Tag:    v2.1.2

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

commit d85d6ccd3ea5d3c3efbc9b00bf9a62c7cecfdc94
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 07:49:54 +0800
Tag:    v2.1.2

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

commit bd90c5891fe89b426f5e51da4d30f5538182b416
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 07:28:05 +0800
Tag:    v2.1.2

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

commit d021250bf088c88ccb1e45ea88e7c2f3eabc30e5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Sep 2011 09:09:50 +0800
Tag:    v2.1.2

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

commit fe245b725b23c5aa7e71486c0071fa86e4eeb98c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Sep 2011 06:26:37 +0800
Tag:    v2.1.2

Merge branch 'MDL-28424_21' of git://github.com/timhunt/moodle.git with changes

commit ded9134e03b84f9d3b198610673b2d2b148e4bf6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 09:04:15 +0800
Tag:    v2.1.2

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

commit d496829c61d6fdfac0ee5689c8ff6536c37350e5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 08:55:27 +0800
Tag:    v2.1.2

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

commit 9c43f8f7e10da024c73ac3598563888e5302779a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 08:48:11 +0800
Tag:    v2.1.2

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

commit 585bd024793625562e78410155a93ad4d9391748
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 07:36:46 +0800
Tag:    v2.1.2

Merge branch 'MDL-29336-numerrors-mapping-21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit d7749a10a62a1e31b861d3da4c1d743db851e85f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 05:53:10 +0800
Tag:    v2.1.2

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

commit 65072bfdc225152fc28d14274cb58c2748c9574b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 05:45:40 +0800
Tag:    v2.1.2

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

commit 9f05075c612b2ba5c59c106c559b5c95bcd5e4e5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 05:39:26 +0800
Tag:    v2.1.2

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

commit c4b234ec544007abcd9d56a10b3924bd57deed2f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Sep 2011 08:13:48 +0800
Tag:    v2.1.2

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

commit 6831c9ff36b4ef578fd7f4a57702da756bb7fe60
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Sep 2011 07:58:23 +0800
Tag:    v2.1.2

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

commit 955f15a71f75f6d1c6780d7a192288f5d220f775
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 15:20:17 +0800
Tag:    v2.1.2

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

commit 5585910ea75de4e613e852db9d2076bc0884b80b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 14:36:55 +0800
Tag:    v2.1.2

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

commit 26c28d082182d9ba9b7e7000d7fadac63bb1f55d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 13:00:40 +0800
Tag:    v2.1.2

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

commit 3d2029f3d4ba657c2bb8b0771367d23285dc862a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 07:57:58 +0800
Tag:    v2.1.2

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

commit 6bc526319e12437202c75b1c1114e8996199de33
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Sep 2011 11:35:27 +0800
Tag:    v2.1.2

Merged branch '28595_m22_installcontinue' of git://github.com/skodak/moodle with changes

commit 90d14d089cfd9aefa4e477a2870b6307a7f9a814
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 15:49:26 +0800
Tag:    v2.1.2

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

commit 4a277f4f4e26330293ce2653ccc6ed698ac77e03
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 11:30:33 +0800
Tag:    v2.1.2

Merge branch 'w36_MDL-29306_m21_dbenrolroles' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 786a905607c134a064966fd56db06f836d76c03d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 11:17:25 +0800
Tag:    v2.1.2

Merge branch 'w36_MDL-29292_m21_featuretypo' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 20ff7e3279a65e90e74ae7c93263b7ef94311d19
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 10:39:22 +0800
Tag:    v2.1.2

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

commit 2513a2b24f898d62916bef58bf4a01eb9e4b8b2a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 10:25:02 +0800
Tag:    v2.1.2

Merge branch 'w36_MDL-29312_m21_cookieless' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 18fc309097564585a066d9b7abea3e0a592c987c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 09:20:47 +0800
Tag:    v2.1.2

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

commit 3cabe2de8cc8cdd7ff41f5e15cc8407834236b56
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Sep 2011 12:08:07 +0800
Tag:    v2.1.2

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

commit 7ecabfdce4f7a05efe7851d9651d789a788b44a7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Sep 2011 12:03:08 +0800
Tag:    v2.1.2

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

commit 05956888d72df83089750bc7947e0849c71908f0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Sep 2011 09:37:33 +0800
Tag:    v2.1.2

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

commit caff2aa6403223f116fd46241625e2e0360ffca2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Sep 2011 07:13:17 +0800
Tag:    v2.1.2

Merge branch 's13_MDL-29170_risklevel_21' of git://github.com/dongsheng/moodle into MOODLE_21_STABLE

commit ce4285c8831eba02ca9538d42a75738bee09c380
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Aug 2011 09:59:26 +0800
Tag:    v2.1.2

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

commit a4ad64950b4d44ff0238a79104924f2def15feaf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Aug 2011 09:05:22 +0800
Tag:    v2.1.2

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

commit 6870b5dcbb0bb40c10b2906f103298a43c8ccfa2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Aug 2011 08:54:40 +0800
Tag:    v2.1.2

Merge branch 'dev_MDL-27289_boxnet_21' of git://github.com/dongsheng/moodle into MOODLE_21_STABLE

commit 78b19caf0aabc2ba2cad23d715d65858dbd3972e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Aug 2011 08:24:57 +0800
Tag:    v2.1.2

Merge branch 'MDL-29135-mnet-login_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit 4f4cbbad8f240fccb9ba8e8ea5859dd811e60a05
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Aug 2011 14:10:12 +0800
Tag:    v2.1.2

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

commit 5553dcba6723d2fb6cdebefeeced9b1cc8fea5b4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 14:22:41 +0800
Tag:    v2.1.2

Merge branch 'mdl-28517_2.1' of git://github.com/colchambers/moodle into MOODLE_21_STABLE

commit 806e82b7fc9d39d77ec51fc038bff25696af11a5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 14:09:53 +0800
Tag:    v2.1.2

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

commit 172007a066a878771c9c28ddce2c22145e5098ba
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 13:59:08 +0800
Tag:    v2.1.2

Merged branch 'MDL-28575_MOODLE_21_STABLE' of git://github.com/kordan/moodle.git with conflict resolution

commit 9a2e30d8bc7a770b0da62b1af9082a98385fddc4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 13:44:52 +0800
Tag:    v2.1.2

Merge branch 'MDL-28587_MOODLE_21_STABLE' of git://github.com/kordan/moodle into MOODLE_21_STABLE

commit 40b4296d074ac0a41f0bf06b4ea6f7609685c62a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 11:18:54 +0800
Tag:    v2.1.2

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

commit f24eca0c6b71f4039a04440ff97840367752ea41
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 11:08:08 +0800
Tag:    v2.1.2

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

commit 9d660d5f0edf84142eb0b7a79695465d69df25c1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 11:04:38 +0800
Tag:    v2.1.2

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

commit cf7daeae7ea5fee712a0f082dd75c01d66b946cf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 11:02:11 +0800
Tag:    v2.1.2

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

commit 62bdb79c266d0e61b28b0829c4c4ab810becfc31
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:57:31 +0800
Tag:    v2.1.2

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

commit 6f7c43c7de8f62cd53a7f3b54ad5325cd109c1be
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:47:33 +0800
Tag:    v2.1.2

Merge branch 'w31_MDL-27586_m21_browser' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit cf8cc1bab17c9cbef8245f6d96e56f4600142ef6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:25:47 +0800
Tag:    v2.1.2

Merge branch 'w31_MDL-27685_m21_pglike' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 6b9c6cc54e983157a7d9015ef4da8a976f566bbd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:20:57 +0800
Tag:    v2.1.2

Merge branch 'w31_MDL-28382_m21_iis' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 31b4fdabbf322ea6b74a0020da34001307adbc61
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:09:46 +0800
Tag:    v2.1.2

Merge branch 'w31_MDL-28450_m21_defgroup' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit a9fbf9fb878142540ba033facaf940fb078d6df9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:06:21 +0800
Tag:    v2.1.2

Merge branch 'w31_MDL-28468_m21_cohortassign' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 2e81c307d01c9187b31586284658909480d149a8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:03:07 +0800
Tag:    v2.1.2

Merge branch 'w31_MDL-28473_m21_blocksupgrade' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 5a5e7bb3b15c6ee93ec7262ec93d075633c7ca79
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 17:56:14 +0800
Tag:    v2.1.2

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

commit 6f2723ae8388e31f26f107541af75dcdb829021c
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 17:47:42 +0800
Tag:    v2.1.2

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

commit 365ed23695743b3ce1d60b5f364274a41ccd69c6
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 17:14:33 +0800
Tag:    v2.1.2

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

commit 26dcfcb542c6d326055501dabef64dce4e041b7e
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 16:59:36 +0800
Tag:    v2.1.2

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

commit 34eee090a703cf574873a162b5e90590012572ac
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 16:51:57 +0800
Tag:    v2.1.2

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

commit 9a1f42da6db9c6bbce07996d9814c3ad5aa2e054
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 16:46:07 +0800
Tag:    v2.1.2

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

commit 3e2569f70d4ef58e1a83b88941106aadfa2f809c
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 16:27:49 +0800
Tag:    v2.1.2

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

commit fa0f970835c788b43104811d1f8c6c1b4f52967e
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 14:09:30 +0800
Tag:    v2.1.2

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

commit f89a34fb7716fe247da64b48f0b16d55b1e3c0ad
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 13:42:12 +0800
Tag:    v2.1.2

Merge branch 's11_MDL-28284_filepicker_module_21' of git://github.com/dongsheng/moodle into MOODLE_21_STABLE

commit 09e7c66714851e9b35ae00bc5fb29dc83aabb75b
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 13:37:17 +0800
Tag:    v2.1.2

Merge branch 'MDL-28510_21_STABLE' of git://github.com/marxjohnson/moodle into MOODLE_21_STABLE

commit c4eea3e21ab05a246e4e5b90466f7d138f9912ea
Author: unknown <SamandJen1@.(none)>
Date:   Tue, 02 Aug 2011 13:26:25 +0800
Tag:    v2.1.2

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

commit b587abd989ba4209233abdec7d7e97e56bcd1173
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 12:23:14 +0800
Tag:    v2.1.2

Merge branch 'MDL-28487-typo_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit 9cacdc07d76a8b944202985f0e538adb936ee502
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 11:46:11 +0800
Tag:    v2.1.2

Merged branch 'm21_MDL-28548' of git://github.com/danmarsden/moodle.git with comment changes

commit c7f69afe4a0d6be3d50bcbbc2faff3ac79f988ac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 29 Jul 2011 10:13:43 +0800
Tag:    v2.1.1

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

commit 93c5c0542360b29d1f4cf9e245ea683ef48ad6fe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 15:14:27 +0800
Tag:    v2.1.1

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

commit 30bfe7398104998b3acaaf53ff088cf9e0d48436
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 13:04:19 +0800
Tag:    v2.1.1

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

commit b835eebad913f98b4bb3a384a40e0c39db0da721
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 12:57:01 +0800
Tag:    v2.1.1

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

commit 38a6a195a4944a36b079e4f4c8a758dba9c801ae
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 11:18:37 +0800
Tag:    v2.1.1

Merge branch 'w29_MDL-22584_m21_monsterpaths' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 18c2fcf8f19e00f0e89421d8fd8b7486a6dc6f79
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 11:03:52 +0800
Tag:    v2.1.1

Merge branch 'w29_MDL-27464_m21_continue' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit dbb6d73c8c3eee9599ecf96ecd996ceadbfd5f10
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:59:21 +0800
Tag:    v2.1.1

Merge branch 'w29_MDL-27653_m21_usercasting' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit ae5375722ed95538269d1620add0cb23d98f3122
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:55:04 +0800
Tag:    v2.1.1

Merge branch 'w29_MDL-27796_m21_httphost' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 274d9cf9501686159e270c932f9898a3612a97b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:45:42 +0800
Tag:    v2.1.1

Merge branch 'w29_MDL-27994_m21_creatorcaps' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 7b205e100b1210a254ea0efd6da18907a0117f50
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:39:47 +0800
Tag:    v2.1.1

Merge branch 'w29_MDL-28145_m21_renderer' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 39a84a780b19bd7675d82f18492c7dcad8e290e7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:36:55 +0800
Tag:    v2.1.1

Merge branch 'w29_MDL-28182_m21_userdel' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit c782b4bb58bc009fa8aa44d28e721894090653aa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:30:00 +0800
Tag:    v2.1.1

Merge branch 'w29_MDL-28337_m21_urlparams' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit b1591c656823ad7d49e1f88eb3d8e2223b32abfa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:14:47 +0800
Tag:    v2.1.1

Merge branch 'w29_MDL-28384_m21_nullurl' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 6e488526330765432fad60f2507c64e3b58501e5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 09:52:49 +0800
Tag:    v2.1.1

Merge branch 'w29_MDL-28432_m21_cohortconfig' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 88b014092d4c318f940aafc674c787a9cd6e5362
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 09:45:42 +0800
Tag:    v2.1.1

Merge branch 'w29_MDL-28440_m21_jssemicol' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 5dd5e3161649598cc49b8c6a44dbe4345e6e2263
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 22:45:35 +0800
Tag:    v2.1.1

Merge branch 'w28_MDL-28363_m21_dimmed' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit bd202c15315c5c2706da62da7f02fae3ece22a66
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 22:39:36 +0800
Tag:    v2.1.1

Merge branch 'MDL-28298-workshop-constant_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit 9190787dff1334c281cf226d8a9b3015b2ac3fdb
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 22:34:58 +0800
Tag:    v2.1.1

Merge branch 'MDL-28325-enrol-help_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit 0a02548c232633e7c8c56e09ab21c9c0cb88e801
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 22:27:04 +0800
Tag:    v2.1.1

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

commit a699cbcdbc246f88c0a517856e3f7c8ed3bdbd8b
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 20:18:52 +0800
Tag:    v2.1.1

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

commit 8910a2d15acbe14c9b1e97599b3aabf00f905921
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 19:51:11 +0800
Tag:    v2.1.1

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

commit 0d9cdacf89325852b578f665b0832cd0f278dbcb
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 19:08:41 +0800
Tag:    v2.1.1

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

commit 982ea1690939d14f8c10f50522b090b70f13dd2f
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 18:26:19 +0800
Tag:    v2.1.1

Merge branch 'w28_MDL-23344_m21_loginfocus2' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 39b10270a119795d0dcc544d3e53edcfc5e57319
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 18:19:20 +0800
Tag:    v2.1.1

Merge branch 'w28_MDL-27804_m21_csvauth' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 4e579f6067d5f9733c301af917c51c3b2f9dbb0c
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 18:10:01 +0800
Tag:    v2.1.1

Merge branch 'w28_MDL-28253_m21_managerupgrade' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit f6c2b4fc1322d6547117da948baa236ea7d4d41f
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 18:04:01 +0800
Tag:    v2.1.1

Merge branch 'w28_MDL-28313_m21_enroldb' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 056c04c9b419ce60e00ba5b7adeaa6dc5601dcba
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 17:39:28 +0800
Tag:    v2.1.1

Merge branch 'w28_MDL-28348_m21_meta' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 03368c0b2ee4244b2e6db046d766f38a4670064c
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 17:28:27 +0800
Tag:    v2.1.1

Merge branch 'w28_MDL-28350_m21_wsra' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 3a9e75e4645cdf0d00294e8a33142ee2cc133ce6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 13 Jul 2011 20:08:56 +0800
Tag:    v2.1.1

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

commit 1541d1a36bd556e45fe5ad31a9b14cef79361744
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 16:02:18 +0800
Tag:    v2.1.1

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

commit a8361fc2146c1ebe81fb714439afc8983ee5ce0f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 13:56:39 +0800
Tag:    v2.1.1

Merge branch 'wip-MDL-27429-m21' of git://github.com/Beedell/moodle into MOODLE_21_STABLE

commit 903c12c74b7e0d638c07558598f1136b3a86cfa6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 11:31:48 +0800
Tag:    v2.1.1

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

commit 73d78d8de4ca3d3f18e284cdcaba83ac89e5c6dd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 11:25:56 +0800
Tag:    v2.1.1

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

commit bbdd6f2dc1067dea7a6fa2ada4f0f715a5d9996e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 11:15:17 +0800
Tag:    v2.1.1

Merge branch 'glossary_multilang_m21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit f738eb06e7f5407b34a5ccd4a12c8d64595ee6b2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 11:04:18 +0800
Tag:    v2.1.1

Merge branch 'mod_url_decode_m21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit 6f30a86bc7d9951a1223eb1849d343cba5d37823
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 10:57:15 +0800
Tag:    v2.1.1

Merge branch 'backup_groups_m21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit baa97ed6232921413de55ab026f0ce76fd2b7403
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jul 2011 11:02:55 +0800
Tag:    v2.1.1

Merge branch 'MDL-28135_MOODLE_21_STABLE' of git://github.com/nebgor/moodle into MOODLE_21_STABLE

commit 90e9d09b5f2153bde3ebcbf8fc0ab25559d9f5da
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 01 Jul 2011 17:01:57 +0800
Tag:    v2.1.0

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

commit 4c9e9e09eafdd5fe2902aae43ebf6c61410d1424
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 01 Jul 2011 15:07:21 +0800
Tag:    v2.1.0

Merge branch 's11_MDL-28121_split_master' of github.com:dongsheng/moodle

commit 54ae8ed032408b1c1087000017a4f58c13b1049c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 30 Jun 2011 10:49:29 +0800
Tag:    v2.1.0

Merge branch 'MDL-24684_master' of git://github.com/stronk7/moodle

commit f86e19b1ee523a7627f18ee23a232feb3daa865d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 29 Jun 2011 17:04:13 +0800
Tag:    v2.1.0

Merge branch 'MDL-27829_block_pagetype_master' of git://github.com/andyjdavis/moodle

commit 5163ac94b06bbdfb8518ea2529f12b6c50b4c53f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 28 Jun 2011 17:04:55 +0800
Tag:    v2.1.0

Merge branch 'MDL-28023_assignment_jabber' of git://github.com/andyjdavis/moodle

commit e2542e1faff9bd2708d6864c05942a9e923be081
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 28 Jun 2011 10:16:57 +0800
Tag:    v2.1.0

Merge branch 's11_MDL-27866_pix_url_master' of git://github.com/dongsheng/moodle

commit 256383c07d1a87f983474d650023d74cfae6bc83
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 28 Jun 2011 10:12:39 +0800
Tag:    v2.1.0

Merge branch 'MDL-28014_head' of git://github.com/grabs/moodle

commit 29e2d0a820f2f4cf3286843177d79544ca45eb1d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 27 Jun 2011 16:03:48 +0800
Tag:    v2.1.0

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

commit 35d4d85dc48ea0cf479e8bf1f5a6d744554712ea
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 27 Jun 2011 15:45:41 +0800
Tag:    v2.1.0

Merge branch 'unsigned_fixes' of git://github.com/stronk7/moodle

commit a3f8860d6ca8adcfaebdee0e39b401904987735d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 27 Jun 2011 15:30:11 +0800
Tag:    v2.1.0

Merge branch 'quizreport_langstrings' of git://github.com/stronk7/moodle

commit da17baf76a72fb86fd6d2e4ab4a7a155f3d0ba73
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 27 Jun 2011 15:28:49 +0800
Tag:    v2.1.0

Merge branch 'backup_bump' of git://github.com/stronk7/moodle

commit 58c724a613fc9ee09b8848cec3ba310c203f4513
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 23 Jun 2011 10:43:57 +0800
Tag:    v2.1.0

Merge branch 'MDL-27169_master' of git://github.com/stronk7/moodle

commit a0977339b015bd6120bc12321f03064b84ab48a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 22 Jun 2011 17:20:49 +0800
Tag:    v2.1.0

Merge branch 'MDL-27952' of git://github.com/stronk7/moodle

commit 115910dccd4a85c50ca827786762f344effc167b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 22 Jun 2011 17:15:10 +0800
Tag:    v2.1.0

Merge branch 'MDL-27966_master' of git://github.com/stronk7/moodle

commit df839f28dcb1065ff529c1383837493c978fa4d1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 22 Jun 2011 17:06:12 +0800
Tag:    v2.1.0

Merge branch 'MDL-25811_master' of git://github.com/stronk7/moodle

commit 8a322fc19b21d63c4acd8f4fc7b601a0ba6aee17
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Jun 2011 15:51:59 +0800
Tag:    v2.1.0

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

commit fe70d8814b5e937e6c02e00cdae44a1db4197436
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Jun 2011 14:31:23 +0800
Tag:    v2.1.0

Merge branch 's11_MDL-27880_get_course_participants_ws' of git://github.com/dongsheng/moodle

commit 8e307054d322a3a70ff6f84abbd6cebc1bd6538f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Jun 2011 14:10:41 +0800
Tag:    v2.1.0

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

commit 70e35c4d1dfdfc7d447e7674801e07b3dca8aef3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Jun 2011 13:45:12 +0800
Tag:    v2.1.0

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

commit 1533a25e51f9d43dcb1f5d20a77a88d99cd6301c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Jun 2011 13:15:37 +0800
Tag:    v2.1.0

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

commit 8ffaf7b4ddf168e521ddac4dfff30a2ecd76f8fb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Jun 2011 13:06:10 +0800
Tag:    v2.1.0

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

commit 3fc7c06b995d723642d35d819548080670d77c77
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Jun 2011 13:02:02 +0800
Tag:    v2.1.0

Merge branch 'quiz_feedback_for_grade' of git://github.com/stronk7/moodle

commit 0e36d0cdf50380c687334241bfd27da124d9413b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Jun 2011 09:52:39 +0800
Tag:    v2.1.0

Merge branch 'MDL-27834' of git://github.com/kordan/moodle

commit f74415b926c4fab1c3fffa20cf69358fc402d0f4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Jun 2011 09:47:52 +0800
Tag:    v2.1.0

Merge branch 'MDL-27286_master' of git://github.com/stronk7/moodle

commit 650142bb9b665d16252417ee3f1e3decdfebb9db
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Jun 2011 09:43:24 +0800
Tag:    v2.1.0

Merge branch 's11_MDL-27497_upload_master' of github.com:dongsheng/moodle

commit d8f85b6e8b4807333a84db2ce00fc41c0e667dc0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Jun 2011 09:32:44 +0800
Tag:    v2.1.0

Merged branch 's11_MDL-27552_token_master' of git@github.com:dongsheng/moodle.git with changes

commit 46d3b9be73585100a72c6ec830871721071b4097
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 16:54:52 +0800
Tag:    v2.1.0

Merged branch 's7_MDL-26105_block_settings_master' git://github.com/andyjdavis/moodle.git with changes

commit 12aafa87699878c0dc413c12a89046c207f9779d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 15:49:24 +0800
Tag:    v2.1.0

Merge branch 'master_MDL-272522' of git://github.com/danmarsden/moodle

commit f44c912bd0aa0164c91246b98d7f69fc423b1e9a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 15:32:44 +0800
Tag:    v2.1.0

Merge branch 'MDL-26147-workshop-ignore-deadlines' of git://github.com/mudrd8mz/moodle

commit 0723dcab40294ee636ee6940ab394f4e70225813
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 15:06:19 +0800
Tag:    v2.1.0

Merged branch 'MDL-26960' of git://git.luns.net.uk/moodle with changes

commit aa8ec18b52c455f5a8059c315b8a8d14f22f2d75
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 14:53:37 +0800
Tag:    v2.1.0

Merge branch 'master_MDL-27404' of git://github.com/danmarsden/moodle

commit 16c2d2c1b4be1c32004c8e64fe6cf001fe82aec4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 14:11:58 +0800
Tag:    v2.1.0

Merge branch 'MDL-26774-wip' of git://github.com/mouneyrac/moodle

commit fcc871181fc331b33aa492e20d4ca7d1559432e9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 14:04:28 +0800
Tag:    v2.1.0

Merge branch 'MDL-27399' of git://github.com/mouneyrac/moodle

commit a7b7c2d3db5fe0ad3acbbff1e9157a20cedd7afb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 11:22:51 +0800
Tag:    v2.1.0

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

commit 355871acd54e9360f825b8710b5876fc1c4095e7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 11:17:59 +0800
Tag:    v2.1.0

Merge branch 'MDL-27757-HEAD' of git://github.com/srynot4sale/moodle

commit 89b2cdb28af494b714d20d3ef12882bd7e64132b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 11:13:29 +0800
Tag:    v2.1.0

Merge branch 'MDL-27783' of git://github.com/mouneyrac/moodle

commit 178ac9033b9448617285d10bb1a01ef5f578fd2b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 10:54:24 +0800
Tag:    v2.1.0

Merged branch 'MDL-27781' of git://github.com/mouneyrac/moodle.git with changes

commit 85ee4e350cf69a23081a4e5692f26f21ee780c85
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 10:39:32 +0800
Tag:    v2.1.0

Merge branch 'MDL-27792-plugin-subsystem' of git://github.com/mudrd8mz/moodle

commit 954adfc923a8a24a77f896d9093366cb8d8fcad9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 10:33:39 +0800
Tag:    v2.1.0

Merged branch 'MDL-27801' of git://github.com/kordan/moodle.git with changes

commit 00a33dcbaca87b31ec87363dcecfb62ec5c1397f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 17:52:59 +0800
Tag:    v2.1.0

Merged branch 'MDL-26777-wip' of git://github.com/mouneyrac/moodle.git

commit 96e0194c058b7e82064789617c755ef0209ea746
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 17:34:17 +0800
Tag:    v2.1.0

Merged branch 'MLD-27551' of git://github.com/mouneyrac/moodle.git with changes

commit 0b8dea80dcddbf6de2148846da382d8e799ee788
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 17:09:05 +0800
Tag:    v2.1.0

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

commit f6bd0b9e39c6784d0676d6ab5c657ffde603b78d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 16:25:57 +0800
Tag:    v2.1.0

Merged branch 'MDL-27695' of git://github.com/nebgor/moodle.git with changes

commit 287d1c0c2cc85de30ace6815ce61bf77334f6652
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 13:49:36 +0800
Tag:    v2.1.0

Merged branch 'MDL-25775_head' of git://github.com/grabs/moodle.git

commit 131a9071d6e5f6d622413bcf4d26020ba1d58f20
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 13:42:33 +0800
Tag:    v2.1.0

Merged branch 'MDL-27118' of git://github.com/epsd/moodle.git

commit de133aa87fdb3657d2f37c12bedc912a90482000
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 13:38:35 +0800
Tag:    v2.1.0

Merge branch 'MDL-27294' of git://github.com/epsd/moodle

commit 405f69eb7bc152576418541babcf269df8196461
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 13:33:42 +0800
Tag:    v2.1.0

Merge branch 'MDL-27704_master' of git://github.com/MaryE/moodle.git

commit d1c96f6604fce9408c9d64eb580a2d428c1268bb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 13:03:11 +0800
Tag:    v2.1.0

Merged branch 'MDL-27692_master' of git://github.com/MaryE/moodle.git

commit 38a466084d58a5bec78e999cef9b936aa13414b1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 11:30:28 +0800
Tag:    v2.1.0

Merge branch 'MDL-25477' of git://github.com/epsd/moodle

commit 9186cb7e984f9fe8f23012c62efe9a0dc4a9a666
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 11:07:22 +0800
Tag:    v2.1.0

Merged branch 'ou-messaging-release' of git://git.luns.net.uk/moodle with conflict resolution for MDL-27171

commit 7bff5441c8b5f3d45edd4989cd03499a9594b983
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 10:58:42 +0800
Tag:    v2.1.0

Merged changes for MDL-25394

commit 9bf5d894defd2ce4e2a0ef273b08255d6eceef9f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 10:38:29 +0800
Tag:    v2.1.0

Merge branch 'MDL-27564-wip' of git://github.com/mouneyrac/moodle with changes for MDL-27564

commit 0373264c2048a3f24b7afbb162cf66bb25621df5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 10:11:51 +0800
Tag:    v2.1.0

Merge branch 'MLD-27565-wip' of 'git://github.com/mouneyrac/moodle.git' with changes and conflict resolution for MDL-27565

commit 78736e5d64dfd4cc3a636f05920144545a0451ac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 10:02:59 +0800
Tag:    v2.1.0

Merged branch 'MDL-27566-wip' of git://github.com/mouneyrac/moodle.git with changes and conflict resolution for MDL-27566

commit c464a23873a05e40b89359051eef0661ea59c4e4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 Jun 2011 16:29:44 +0800
Tag:    v2.1.0

Merged branch 's9_MDL-26392_wiki_files_master' from git://github.com/dongsheng/moodle.git with fixes

commit e0f18a37c933d78df87bf210adde69b6dc1e2a5a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 Jun 2011 16:24:17 +0800
Tag:    v2.1.0

Merge branch 'MDL-27734-workshop-example-weight' of git://github.com/mudrd8mz/moodle

commit 656bb6725b3879d3219aa340b3af7ea5677e3245
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 Jun 2011 16:23:34 +0800
Tag:    v2.1.0

Merge branch 'MDL-27733-workshop-deadlines' of git://github.com/mudrd8mz/moodle

commit ac6668198b4b01565acae197bbccb204714b4349
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 Jun 2011 16:13:52 +0800
Tag:    v2.1.0

Merge branch 'MDL-27732-glossary-introformat' of git://github.com/mudrd8mz/moodle

commit f5936345cdcc69e250963b6cafd073c5012e54d8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 Jun 2011 16:09:55 +0800
Tag:    v2.1.0

Merge branch 'admin_whitespace_cleanup_master' of git://github.com/stronk7/moodle

commit 6e768484278fd362bbbb730fa5509b20cbffd8e5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 Jun 2011 16:01:49 +0800
Tag:    v2.1.0

Merge branch 'todo_wiki_upgrade_master' of git://github.com/stronk7/moodle

commit 52a3c2c703694295aeddb260360cbb47e0b0129d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 May 2011 17:21:29 +0800
Tag:    v2.1.0

Merge branch 'wip-mdl-27603-master' of git://github.com/rajeshtaneja/moodle

commit 8dc13ee7b088c524a937b2bef62d6951337e2e7e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 May 2011 13:03:07 +0800
Tag:    v2.1.0

Merge branch 'MDL-25512_master' of git://github.com/MaryE/moodle.git

commit 5436561c7c25bad808c1b5690f5ffa857f4afcbc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 May 2011 10:05:59 +0800
Tag:    v2.1.0

Merge branch 'MDL-27600-master' of git://github.com/sammarshallou/moodle

commit 59023e77997544e8b38f49838e8de2cca777602e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 May 2011 09:18:02 +0800
Tag:    v2.1.0

Merge branch 'MDL-27636_master' of git://github.com/stronk7/moodle

commit 9efd421e0ec9c58d58aab2bc0dbf7cd7067c8707
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 May 2011 08:56:15 +0800
Tag:    v2.1.0

Merge branch 'navigationlib_userreports' of git://github.com/stronk7/moodle

commit 91bad7adc13b7d2e5d5329f7e99f8466eef6ef23
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 May 2011 08:54:15 +0800
Tag:    v2.1.0

Merge branch 'MDL-27627-master' of git://github.com/sammarshallou/moodle

commit 12b3d5828689be278aeed5264a0dfbe4e71e512e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 May 2011 15:32:27 +0800
Tag:    v2.1.0

Merge branch 'MDL-22833' of git://github.com/MaryE/moodle.git

commit 2c2034c9c365ac97ca906047f81589d4d7a2a410
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 May 2011 11:32:23 +0800
Tag:    v2.1.0

Merge branch 'master_MDL-25177_choice_windowfix' of git://github.com/danmarsden/moodle

commit 34997cf89e706c3f2f92a4241d48e344aafc028c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 May 2011 11:24:39 +0800
Tag:    v2.1.0

Merge branch 'MDL-27530_head' of git://github.com/grabs/moodle

commit 870b8b0402136e22ade8b3a4ff99fd7909997433
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 May 2011 12:28:18 +0800
Tag:    v2.1.0

Merge branch 'MDL-27161_head' of git://github.com/rwijaya/moodle.git

commit 731d1b89ad2967d946a7896abf77ded2c60f1148
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 May 2011 12:14:11 +0800
Tag:    v2.1.0

Merge branch 'MDL-27387_rating_scale_validation_master2' of git://github.com/andyjdavis/moodle

commit c23ee732c210e08afd0d3f30667c53c9fa383810
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 May 2011 11:51:41 +0800
Tag:    v2.1.0

Merge branch 'MDL-26075_head' of git://github.com/grabs/moodle

commit d5a99a030c7ea797b8d01c86ad2204e7b828b9a5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 May 2011 10:06:49 +0800
Tag:    v2.1.0

Merge branch 'start_end_notifications' of git://github.com/stronk7/moodle

commit 62ff4fe30b228f31a48973292b475ea55f329ef1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 May 2011 09:56:42 +0800
Tag:    v2.1.0

Merge branch 'prevent_profiling_before_install' of git://github.com/stronk7/moodle

commit a0fcf81265d605ef577ce93c3a42c2ba98f7f364
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 May 2011 09:45:40 +0800
Tag:    v2.1.0

Merge branch 'MDL-27140_master' of git://github.com/stronk7/moodle

commit 8f25ae26db4c21efc5935641c4681327dec0fb0e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 May 2011 10:35:31 +0800
Tag:    v2.1.0

Merge branch 'MDL-27325_master' of git://github.com/stronk7/moodle

commit 644b14c552f94048954ecf92b696dca04f4a411a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 May 2011 10:20:15 +0800
Tag:    v2.1.0

Merge branch 'MDL-27367-HEAD' of git://github.com/srynot4sale/moodle

commit a02f87a83825a7789c00fa2039f518d3757fbc8b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 05 May 2011 13:25:36 +0800
Tag:    v2.1.0

Merge branch 's9_MDL-27382_dropbox_get_file_fix_master' of github.com:dongsheng/moodle

commit 74704aab26cd0b3e93d0406205651dbb6a8adbdc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 05 May 2011 13:22:15 +0800
Tag:    v2.1.0

Merge branch 's9_MDL-27381_overwrite_dialog_safari_master' of github.com:dongsheng/moodle

commit d6e0313e86cd9e0015c96f3cf58e3c1f90260fbd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 05 May 2011 11:44:49 +0800
Tag:    v2.1.0

Merge branch 's9_MDL-26854_spam_comments_master_2' of git://github.com/dongsheng/moodle

commit d045b479f42710f29663184ea578f2f8f40b2711
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 05 May 2011 10:41:53 +0800
Tag:    v2.1.0

Merge branch 's9_MDL-26854_spam_comments_master_2' of git://github.com/dongsheng/moodle

commit 2c82d0eeb0c79726f0f7354a90f5bae39e1589f2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 05 May 2011 10:18:39 +0800
Tag:    v2.1.0

Merge branch 'MDL-26838_ratings_bad_data_master4' of git://github.com/andyjdavis/moodle

commit 280b1b21c0dc5193b09b8d5c3388abfb27f03cd5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 May 2011 18:04:10 +0800
Tag:    v2.1.0

Merge branch 'MDL-26250-final6' of github.com:mouneyrac/moodle

commit f4c7c735f51ed97145478932156c4d9c14de42c6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 May 2011 13:53:47 +0800
Tag:    v2.1.0

Merge branch 's10_MDL-27330_dropbox_authorization_url_master' of github.com:dongsheng/moodle

commit c8ad2c12bae0e895faffe5b4eee5b43dc982a10b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 May 2011 16:27:31 +0800
Tag:    v2.1.0

Merged MDL-26388 Fixed whitespace

commit 870815faed6cf2aef67b99e883f91dff7c85788a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 May 2011 15:41:34 +0800
Tag:    v2.1.0

Merged MDL-25805 Renamed property and function to be a little more descriptive

commit 5f1c825dfafbb4015d9e1197bdffe75fa30a1114
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 May 2011 10:51:06 +0800
Tag:    v2.1.0

Merged MDL-27251 Fixed up whitespace, Fixed broken string, reworded new strings

commit fa49d2431282da0975ca24f834689c79074c66d9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 May 2011 14:43:24 +0800
Tag:    v2.1.0

Merged changes and fixed whitespace issues for MDL-23188

commit c0ceb0bab3ba195fa60823f0ab0b3111f792e82e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 May 2011 14:21:16 +0800
Tag:    v2.1.0

Merge branch 'MDL-26955-themedir-plugindirectory' of git://github.com/mudrd8mz/moodle

commit 0af90dca017d97cef20040da3bff9e53c0d0e26c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 May 2011 14:16:13 +0800
Tag:    v2.1.0

Merge branch 'MDL-27116-themedir-config' of git://github.com/mudrd8mz/moodle

commit 598a9f77267f68f0464e1ca937a57fde2d70f271
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 May 2011 14:03:36 +0800
Tag:    v2.1.0

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

commit 290a5db67ef9a2afafc0a6fcc06a4f7866a684fc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 May 2011 12:11:23 +0800
Tag:    v2.1.0

Merge branch 'MDL-27246-cutomlang-version' of git://github.com/mudrd8mz/moodle

commit 4d8bd3f570b12831fe0e84526d81fc83b59d9fd2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Apr 2011 16:25:40 +0800
Tag:    v2.1.0

Merged with small fix branch MDL-26516_head from git://github.com/rwijaya/moodle.git

commit 9146566c651109fe25d93df830d99d4aef1dcd8a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Apr 2011 10:35:50 +0800
Tag:    v2.1.0

Merged with conflict resolution branch MDL-26835_MASTER_grader_highlight_suspended_users from git://github.com/andyjdavis/moodle.git

commit d0542700f5267e184d33aa7da762ddec3374ea1b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Apr 2011 10:16:39 +0800
Tag:    v2.1.0

Merge branch 'MDL-25999_head' of git://github.com/rwijaya/moodle

commit 2e79cd117ace45e07db86c7d3ee3493648afe791
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Apr 2011 15:35:03 +0800
Tag:    v2.1.0

Merge branch 'MDL-25746' of git://github.com/nebgor/moodle

commit e1ce7c7e7b4c17ce133b547e713b838b9e97c6a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Apr 2011 14:48:01 +0800
Tag:    v2.1.0

Merge branch 'MDL-26896' of git://github.com/stronk7/moodle

commit 08c2633f12ec363dcd9c6a910ec50cf82c218db0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Apr 2011 14:28:57 +0800
Tag:    v2.1.0

Merge branch 'MDL-27034_xhprof_table_sql_master' of git://github.com/stronk7/moodle

commit cf0050f92ac8609c96af0b635830e9f9d7c7d612
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Apr 2011 11:48:18 +0800
Tag:    v2.1.0

Merge branch 'MDL-26185_master' of git://github.com/andyjdavis/moodle

commit d59d34e9a74091505e183c98d8628098cdeaca68
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Apr 2011 11:42:53 +0800
Tag:    v2.1.0

Merge branch 'w15_MDL-27056_m21_maxmind' of git://github.com/skodak/moodle

commit 637a8daf76c282464e859df4ffc39535acee83f1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Apr 2011 13:30:55 +0800
Tag:    v2.1.0

Merge branch 'MDL-26185_ms' of git://github.com/rwijaya/moodle

commit adb24226bfcd4810b163eb9f44dc007492ad6c89
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Apr 2011 13:08:37 +0800
Tag:    v2.1.0

Merge branch 'MDL-27016' of git://github.com/MaryE/moodle

commit 4632bb96685a40a435125ba51bb8d7752bab7aa9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Apr 2011 11:16:33 +0800
Tag:    v2.1.0

Merge branch 'earlier_profiling' of git://github.com/stronk7/moodle

commit 223680f56281e720404345c2f3c4f379642044b3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Mar 2011 16:12:55 +0800
Tag:    v2.1.0

Merge branch 's8_MDL-26916_filepicker_paging' of git://github.com/dongsheng/moodle

commit 628c600cd92f24d9d20d8e5ac82e2e7bd252503d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Mar 2011 16:10:39 +0800
Tag:    v2.1.0

Merge branch 'm20_MDL-26957_forum_overview' of git://github.com/danmarsden/moodle

commit 6db981b2ee512c4464af81acad84938c3c082313
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Mar 2011 16:03:15 +0800
Tag:    v2.1.0

Merge branch 'MDL-26906-2' of git://github.com/epsd/moodle

commit e1a7281ab26b3486f0e400e1304bdd2caebee570
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Mar 2011 15:59:25 +0800
Tag:    v2.1.0

Merge branch 'MDL-26077_message_strip_brackets2' of git://github.com/andyjdavis/moodle

commit e1339a6dda3f39f11854623d262b6ffb4e7d2ca3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Mar 2011 15:52:21 +0800
Tag:    v2.1.0

Merge branch 's8_MDL-26798_dropbox_repo' of git://github.com/dongsheng/moodle

commit bc071c75803522d8f76c85954be150021562fa52
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Mar 2011 14:29:50 +0800
Tag:    v2.1.0

Merge branch 'w13_MDL-26992_21_uploadtemplates' of git://github.com/skodak/moodle

commit 982e619d2a3ba153a53841d6536cbba8c8104014
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Mar 2011 14:10:44 +0800
Tag:    v2.1.0

Merge branch 'w13_MDL-26989_21_enrolroles' of git://github.com/skodak/moodle

commit d2c4a97a70f6f3edae11a5e7e5e4d26431de35c9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Mar 2011 13:54:39 +0800
Tag:    v2.1.0

Merge branch 'w13_MDL-26795_21_emailchange' of git://github.com/skodak/moodle