Git merges in Moodle 2.1.0 by Sam Hemelryk

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