Git merges in Moodle 2.0.2 by Sam Hemelryk

commit 0032523aeda6d73c6e938ec56488a86ae81351cd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Feb 2011 17:58:12 +0800
Tag:    v2.0.2

Merge branch 'PULL-226-workshop' of git://github.com/mudrd8mz/moodle

commit 6ae16d7fff6fe24dd67005997482bc2e11cc7971
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Feb 2011 16:31:38 +0800
Tag:    v2.0.2

Merge branch 'w06_MDL-26262_20_onlineblock' of git://github.com/skodak/moodle

commit 9cb70adc338cebca2e7fcd7c2a7223182c9eedc9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Feb 2011 16:20:02 +0800
Tag:    v2.0.2

Merge branch 'w06_MDL-26238_20_group' of git://github.com/skodak/moodle

commit 9377348eb0624f4719b672eec6cc7fa86764ae57
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Feb 2011 16:11:50 +0800
Tag:    v2.0.2

Merge branch 'w06_MDL-26221_20_courserole' of git://github.com/skodak/moodle

commit dedda4abc3135590dda81225fa32ce408a3838e2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Feb 2011 16:03:27 +0800
Tag:    v2.0.2

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

commit c1a974983a06310f257b66ed99ad202cb24a7f81
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Feb 2011 15:41:26 +0800
Tag:    v2.0.2

Merge branch 'MDL-26245-typo_in_exception_string' of git://github.com/mudrd8mz/moodle

commit 82bbf32d3cd00d044098ae477ac6a479b5f24018
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Feb 2011 15:32:23 +0800
Tag:    v2.0.2

Merge branch 'MDL-26252-import-groups-help' of git://github.com/mudrd8mz/moodle

commit d44327efd9864497641f2597a87553f17f4961c8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Feb 2011 15:16:40 +0800
Tag:    v2.0.2

Merge branch 'MDL-26119_message_logging' of git://github.com/andyjdavis/moodle

commit 89652edd6ce7ae5307c32eeffd453f6943e2ac38
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Feb 2011 15:13:53 +0800
Tag:    v2.0.2

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

commit 449adacbc3b0ebc99e62c5ad7d70168f787f02e4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Feb 2011 14:21:24 +0800
Tag:    v2.0.2

Merge branch 'MDL-25639' of git://git.luns.net.uk/moodle

commit 1ca95a13f3ea4ea1cfcc73caf5202ff3b05b8a2c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Feb 2011 14:01:00 +0800
Tag:    v2.0.2

Merge branch 'MDL-25874' of git://git.luns.net.uk/moodle

commit e8d6d2472978bab564831a6ca62e480432648742
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Feb 2011 13:50:36 +0800
Tag:    v2.0.2

Merge branch 'm20_MDL-25671_data_template_editor' of git://github.com/dongsheng/moodle

commit ed4801f4f0ee0d59dd84cd3e18636686a6b300e7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Feb 2011 13:40:51 +0800
Tag:    v2.0.2

Merge branch 'MDL-25939'

commit 2b1f6ced64216b30489aa4e898583f93a39e3061
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Jan 2011 17:47:30 +0800
Tag:    v2.0.2

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

commit 1f5a33439eb7d0aef2e1cfe75d2512fa7a430a95
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Jan 2011 17:16:56 +0800
Tag:    v2.0.2

Merge branch 'm20_MDL-26176_cleanup' of github.com:danmarsden/moodle

commit dfc05681f2bcfb7b9d94ea2ebfc901716236b424
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Jan 2011 17:06:53 +0800
Tag:    v2.0.2

Merge branch 'm20_MDL-25781_TOC_fix' of git://github.com/danmarsden/moodle

commit d44d6448db1c98bb67d5ad4b9a5d08b61a5d8889
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Jan 2011 16:28:28 +0800
Tag:    v2.0.2

Merge branch 'w05_MDL-26069_20_filecheck' of git://github.com/skodak/moodle

commit cf59f747d0c08f5da763ae0d4d7d9fa3d5000384
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Jan 2011 14:58:08 +0800
Tag:    v2.0.2

Merge branch 'MDL-25913'

commit 0c6ab77c58c17b7f092a05ef4fa04ea16b600156
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Jan 2011 14:41:04 +0800
Tag:    v2.0.2

Merge branch 'MDL-25914'

commit 1c4b7783761409a7f1ace7fdd54fbe03f99e62c0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Jan 2011 14:16:46 +0800
Tag:    v2.0.2

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

commit 16ce82a4d3b7f1020abe07a0928145e61f3470a6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Jan 2011 14:10:12 +0800
Tag:    v2.0.2

Merge branch 'MDL-25834'

commit 3721781dfed869a53d3625f4e0fbda0a2f106ef9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Jan 2011 13:50:21 +0800
Tag:    v2.0.2

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

commit 60177f84a82337419c1e7ce11c6069b772331dba
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Jan 2011 13:31:40 +0800
Tag:    v2.0.2

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

commit 13b9fe035c62fd772212c2aa5477b96948961662
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Jan 2011 13:17:26 +0800
Tag:    v2.0.2

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

commit 8dadee2499aa22579508dd4b821948ce552625de
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Jan 2011 13:05:09 +0800
Tag:    v2.0.2

Merge branch 'MDL-21250-capitalized_strings' of git://github.com/mudrd8mz/moodle

commit 299a3e70813f5a520e3339ca767bd06a5ea8636f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Jan 2011 12:09:53 +0800
Tag:    v2.0.2

Merge branch 'MDL-26158'

commit 3e6d0ac62804931660323ea8e855f09f3ba3e43d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Jan 2011 11:52:40 +0800
Tag:    v2.0.2

Merge branch 'w05_MDL-25743_20_selfenrol' of git://github.com/skodak/moodle

commit ac36bda238c688125b2968828137d23aed495abc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Jan 2011 12:18:05 +0800
Tag:    v2.0.2

PULL-157, MDL-26116 Fixed merge conflicts

commit 912d099cc94e40777b73b2412d12ffd95f79856d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jan 2011 16:20:51 +0800
Tag:    v2.0.2

Merge branch 'MDL-25637'

commit c9b2e8bf61331c08b94c14d5c99e349c49c03b2d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jan 2011 15:05:55 +0800
Tag:    v2.0.2

Merge branch 'w04_MDL-26035_20_installtest' of git://github.com/skodak/moodle

commit c053c86c5b1ac6f6839d9fe9b93b79d273080767
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jan 2011 13:26:51 +0800
Tag:    v2.0.2

Merge branch 'w04_MDL-26066_20_dbenrol' of git://github.com/skodak/moodle

commit b6c7558c2d38d73238bfd9d70a0cc149c51c43d9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jan 2011 11:57:06 +0800
Tag:    v2.0.2

Merge branch 'w04_MDL-26096_20_catenrol' of git://github.com/skodak/moodle

commit 0243d7eb2f0cbef8a916acdf4d390b5b91de65a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jan 2011 11:51:38 +0800
Tag:    v2.0.2

Merge branch 'w04_MDL-25855_20_filerequire' of git://github.com/skodak/moodle

commit 2e725dd72be130d494e539729c5c5c66c8cfb518
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jan 2011 11:38:29 +0800
Tag:    v2.0.2

Merge branch 'MDL-26061-no_remote_users' of git://github.com/mudrd8mz/moodle.git with changes

commit c7a8c3623371e91d37a6cd955927d7dda31ed523
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jan 2011 11:10:40 +0800
Tag:    v2.0.2

Merge branch 'w04_MDL-26008_20_creator' of git://github.com/skodak/moodle

commit 12cd15aeaa608bb00829c8d47c7822181ec1e670
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jan 2011 11:07:29 +0800
Tag:    v2.0.2

Merge branch 'w04_MDL-26106_20_lebletypo' of git://github.com/skodak/moodle

commit 4fd25ab95cfbf68c6d6586a13e3f18ce4222780c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jan 2011 11:02:07 +0800
Tag:    v2.0.2

Merge branch 'm20_MDL-26063_SCORM_grouping' of git://github.com/danmarsden/moodle

commit 88c3ba8c06616696e104b188360ebe901d7e69b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jan 2011 11:00:27 +0800
Tag:    v2.0.2

Merge branch 'w04_MDL-26041_20_resources' of git://github.com/skodak/moodle

commit f8b214e1cde48ae1d02798a9ab387981ee0a2158
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jan 2011 10:45:46 +0800
Tag:    v2.0.2

Merge branch 'w04_MDL-26045_20_onlineblock' of git://github.com/skodak/moodle

commit e53a87dcb59247df40c92f7a9a36ca0c34400576
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jan 2011 10:31:34 +0800
Tag:    v2.0.2

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

commit ab8bc2ee1cbbd29de2645cb91b3773ce54afa424
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jan 2011 10:20:22 +0800
Tag:    v2.0.2

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

commit 34b681701ae15caf3296aa1a7bde38d7b26fa907
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jan 2011 10:08:32 +0800
Tag:    v2.0.2

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

commit 69f9e678a336a073b862bef34516303420c1ea9c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jan 2011 17:41:23 +0800
Tag:    v2.0.2

Merge branch 'MDL-25988_20_wip_enrolroles' of git://github.com/skodak/moodle

commit 13738840b2a7ee39b0913116b43634087845d40f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jan 2011 15:40:50 +0800
Tag:    v2.0.2

Merge branch 'MDL-26031_20_wip_guestsession' of git://github.com/skodak/moodle

commit 07d4c7ac6e1305a3a2e975d1402c2da71e2f0d89
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jan 2011 15:34:43 +0800
Tag:    v2.0.2

Merge branch 'MDL-26007_20_wip_enverror' of git://github.com/skodak/moodle

commit dcad74e406c4f6bd89159252a004ea40a464dda1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jan 2011 14:18:24 +0800
Tag:    v2.0.2

Merge branch 'MDL-25910_20_wip_mysqlsocket' of git://github.com/skodak/moodle

commit e5654cad1e10d34073e5b06be2f4494846c7779e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jan 2011 13:47:31 +0800
Tag:    v2.0.2

Merge branch 'MDL-25754_20_wip' of git://github.com/skodak/moodle

commit ec9b044d12e8b5e508a951c40c52be09d22e2bf9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jan 2011 12:03:11 +0800
Tag:    v2.0.2

Merge rebased branch 'MDL-25769' of git://github.com/andyjdavis/moodle.git

commit 3d12d1682ea7adb33446db6ae0eaa782e962b77b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jan 2011 10:56:51 +0800
Tag:    v2.0.2

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

commit 9498654c1d6feba14bbac91de2900d3382995173
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jan 2011 16:00:20 +0800
Tag:    v2.0.2

Merge branch 'MDL-17884_m20' of git://github.com/rwijaya/moodle

commit fe1f367a115e90f805ff537132ae912b0fdc3b62
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jan 2011 15:54:27 +0800
Tag:    v2.0.2

Merge branch 'MDL-25729_m20' of git://github.com/rwijaya/moodle

commit ca08b132e37477c7901aacff2c11cdef02324e33
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jan 2011 15:36:10 +0800
Tag:    v2.0.2

Merge branch 'MDL-25860_20_wip_grpblocks' of git://github.com/skodak/moodle

commit 83be8fce3a5849f37ce90600d291d02ee97f7754
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jan 2011 15:24:01 +0800
Tag:    v2.0.2

Merge branch 'MDL-25973_20_wip_charset' of git://github.com/skodak/moodle

commit c4592a2ac030bc25f16f70c3d67f4e11a1f909f5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jan 2011 15:12:18 +0800
Tag:    v2.0.2

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

commit 616e81cee92e27d4871c706bcf7de21c327a2a4a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jan 2011 13:17:04 +0800
Tag:    v2.0.2

Merge branch 'MDL-25962_20_wip_removeyui' of git://github.com/skodak/moodle

commit 242c4319ab9f4640f58f9f7caee9748c6a6043b8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jan 2011 13:08:33 +0800
Tag:    v2.0.2

Merge branch 'MDL-25936_wip' of git://github.com/skodak/moodle

commit bec662a0f603aceb43682874a51edd05c9600930
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jan 2011 11:35:06 +0800
Tag:    v2.0.2

Merge branch 'MDL-25837_wip' of git://github.com/skodak/moodle

commit 227d6da5d870895beadc70a52a19dd7969ef8982
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jan 2011 10:53:24 +0800
Tag:    v2.0.2

Merge branch 'MDL-25907_wip'

commit 0f1363069191ca2e7527067110a2d5712515e671
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jan 2011 10:17:40 +0800
Tag:    v2.0.2

Merge branch 'MDL-25836_wip' of git://github.com/skodak/moodle

commit c5ea8d0bcc65b8aef879232b370b89b96e186991
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jan 2011 09:35:34 +0800
Tag:    v2.0.2

Merge branch 'MDL-25935-user_picture_fields' of git://github.com/mudrd8mz/moodle

commit 4b3c86b1528ec145fad9925be2add2288debdd5f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jan 2011 16:40:30 +0800
Tag:    v2.0.2

Merge branch 'MDL-24133' of git://git.luns.net.uk/moodle

commit 5539372b2742c694f8c03254328f1b6494cd3108
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jan 2011 16:36:49 +0800
Tag:    v2.0.2

Merge branch 'MDL-25909' of git://git.luns.net.uk/moodle

commit 0017173f1ad98c25780408e5022ac7dc92cf380b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jan 2011 16:26:17 +0800
Tag:    v2.0.2

Merge branch 'MDL-23393' of git://git.luns.net.uk/moodle

commit 1cc0c36e0417a05fab99d887c5b90a77c54bd57f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jan 2011 16:12:50 +0800
Tag:    v2.0.2

Merge branch 'MDL-23425' of git://git.luns.net.uk/moodle

commit 03364f9e2f3eb5c0b5336c82adde5b9d1acc8d15
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jan 2011 16:10:46 +0800
Tag:    v2.0.2

Merge branch 'MDL-25869' of git://git.luns.net.uk/moodle

commit 726bc5250482389360700ce0d7c915a8a601eee1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jan 2011 16:01:08 +0800
Tag:    v2.0.2

Merge remote branch 'mouneyrac/MDL-25768'

commit 6b9240c55e059f7f1fa121186f5f068b6a47032c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jan 2011 13:39:44 +0800
Tag:    v2.0.2

Merge branch 'MDL-23657' of git://git.luns.net.uk/moodle

commit 9e41043ca432b859d64234d4392db8cfdfe7176c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jan 2011 13:33:48 +0800
Tag:    v2.0.2

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

commit 1861a2875a7d1502a24d5aea36b6f22dc1d454ba
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jan 2011 13:10:33 +0800
Tag:    v2.0.2

Merge branch 'MDL-24299' of git://git.luns.net.uk/moodle

commit 34e54bbb623e5f91769a22e61baa8b3ecfb8b7a8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jan 2011 13:02:52 +0800
Tag:    v2.0.2

Merge branch 'MDL-25478' of git://git.luns.net.uk/moodle

commit 0d2d7a6553a7388c50047ef58b9d351779219e47
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jan 2011 12:08:10 +0800
Tag:    v2.0.2

Merge branch 'MDL-25709-2' of git://git.luns.net.uk/moodle

commit dfcf4e081986df3be202e850f1bde8644bd20ba9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Jan 2011 13:47:55 +0800
Tag:    v2.0.2

Merge branch 'MDL-25525' of git://git.luns.net.uk/moodle

commit 724125bdd437fc0166e131372bc1b738e06f0502
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Jan 2011 13:30:32 +0800
Tag:    v2.0.2

Merge branch 'MDL-25657' of git://git.luns.net.uk/moodle