Git merges in Moodle 2.1.0 by Eloy Lafuente (stronk7)

commit c5b0344b6226c977623684a02a3c1cae57f03ede
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 02 Jul 2011 04:33:04 +0800
Tag:    v2.1.0

Merge branch 'MDL-28152-course-grade-category' of git://github.com/mudrd8mz/moodle

commit 0e2901443c29ee28577afe5880aab31be402b58b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 02 Jul 2011 04:17:16 +0800
Tag:    v2.1.0

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

commit ec48e283b04a0e12921c7298834759a68ecc7b17
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 01 Jul 2011 22:13:51 +0800
Tag:    v2.1.0

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

commit 264d81eee38089052695c5f3f11a7d09ccc33002
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 01 Jul 2011 19:43:05 +0800
Tag:    v2.1.0

Merge branch 's11_MDL-27976_undefined_variable_master' of github.com:dongsheng/moodle

commit 67fcc9989a38505d3ffad4bde8d37855c3c42f48
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 01 Jul 2011 17:51:26 +0800
Tag:    v2.1.0

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

commit 3bd43d3d5c9b6f20dee8ac381954db33692776c7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 01 Jul 2011 17:05:17 +0800
Tag:    v2.1.0

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

commit 49752ecb59593b71c76fead328e756154b8db89c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 01 Jul 2011 16:40:15 +0800
Tag:    v2.1.0

Merge branch 'MDL-28022-glossary-export' of git://github.com/mudrd8mz/moodle

commit a80d6ab536ec13ee63aaa50e29283048deeeab91
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 01 Jul 2011 07:49:59 +0800
Tag:    v2.1.0

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

commit 70debd739141cb383c663d8013ebe591e5b2d750
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 01 Jul 2011 07:41:38 +0800
Tag:    v2.1.0

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

commit 4411596c276fd869526d650fd2008ed3100b26d4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 01 Jul 2011 07:37:43 +0800
Tag:    v2.1.0

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

commit d72129829f282682ee303261590aa0c733b725fb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 01 Jul 2011 07:10:06 +0800
Tag:    v2.1.0

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

commit f9d2eb4f20a1349b645647965522057f5f4366cc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 01 Jul 2011 06:54:35 +0800
Tag:    v2.1.0

Merge branch 'MDL-28099_wip' of git://github.com/jamiepratt/moodle

commit 7ace3a21996122d90653b08e08ddfbbc0631ca69
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 01 Jul 2011 06:09:50 +0800
Tag:    v2.1.0

Merge branch 'MDL-28006-convert-gradebook' of git://github.com/mudrd8mz/moodle

commit b1273d09dd753290b173649455124d1849de6db1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 01 Jul 2011 05:56:53 +0800
Tag:    v2.1.0

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

commit 0bd8f4c6653eb036f5b22389fc7eabd23d62d2c7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 23:09:42 +0800
Tag:    v2.1.0

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

commit 91dc377b74618b6a24eec32cad8509daf615587f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 22:39:45 +0800
Tag:    v2.1.0

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

commit db0fe3b295b81bea33889efc511ca5678dd234f2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 22:22:20 +0800
Tag:    v2.1.0

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

commit 4ea6ce7e39fcfa0d87ea98c6e14bc5f5c59c1a55
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 07:59:49 +0800
Tag:    v2.1.0

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

commit 9829fa826124abdfc92013c5b81e486555b9e609
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 07:54:19 +0800
Tag:    v2.1.0

Merge branch 'MDL-15587-head' of git://github.com/grabs/moodle

commit 06a7f952cb83f945a7630a9de96fa70695efc68d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 07:16:57 +0800
Tag:    v2.1.0

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

commit 0bde123fa80b8f296c95602d4349a9d063025c37
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 07:13:34 +0800
Tag:    v2.1.0

Merge branch 'wip-MDL-27431-master' of git://github.com/Beedell/moodle

commit ca2b89d5dfb7e62fb7be797ac7bde2d794fdf752
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 07:10:51 +0800
Tag:    v2.1.0

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

commit a092e9bc42f65a63a5873029577dda006b2db0af
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 06:55:20 +0800
Tag:    v2.1.0

Merge branch 'wip-MDL-25249-master-r1' of git://github.com/samhemelryk/moodle

commit 586fecb80bda0e3d9a6fcbf691f85b0ebe65d6dd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 06:20:43 +0800
Tag:    v2.1.0

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

commit 497ad94adbdaca0279391515940463b8e39e8897
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 06:02:51 +0800
Tag:    v2.1.0

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

commit f684dce0139afcc553257b5958ada15acbace14d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 06:00:12 +0800
Tag:    v2.1.0

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

commit 88933f08cbe66358f0b3bf3f481481ca586bb1f7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 05:51:33 +0800
Tag:    v2.1.0

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

commit 0f744d2ca402c0dde69d60053475ee1745a343d2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 05:33:01 +0800
Tag:    v2.1.0

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

commit be13d37a0299433e91bee2dda1fca04a57ba3866
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 05:09:13 +0800
Tag:    v2.1.0

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

commit f4eeee5bd59b0695502cc840f8befe615c2ccaec
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 03:00:06 +0800
Tag:    v2.1.0

Merge branch 'pagelib_single' of git://github.com/marxjohnson/moodle

commit 76feb947b68edfc2fcc675d88508f4831c017b8d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 02:58:27 +0800
Tag:    v2.1.0

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

commit f0548d18bf213aad5a0126dbadf06dda9778de44
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 02:47:16 +0800
Tag:    v2.1.0

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

commit fae9cd077c754f33d8eca20b92bbc8792282b8d1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 02:44:49 +0800
Tag:    v2.1.0

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

commit 282a0a713e504b6dcdd2781718e32c3a8a0c2b2f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 02:11:17 +0800
Tag:    v2.1.0

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

commit 1333c05ebe02924fe5e34a9faa4291c37f3a5038
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 02:00:49 +0800
Tag:    v2.1.0

Merge branch 's11_MDL-27936_send_message_master' of github.com:dongsheng/moodle

commit 3a4c390c53ac9b68710398c8bbf1c22b4b3b33fb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 01:50:39 +0800
Tag:    v2.1.0

Merge branch 's11_MDL-27976_get_users_by_courseid_master' of github.com:dongsheng/moodle

commit 9cdff2b2a5d555e8084cdbb3b55196d36aacfc72
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 00:12:18 +0800
Tag:    v2.1.0

Merge branch 'wip-MDL-27988-master' of git://github.com/samhemelryk/moodle

commit ae5b0cde4d3762f8ff677bdef96f14e110482f3a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Jun 2011 21:42:26 +0800
Tag:    v2.1.0

Merge branch 'MDL-27955_HEAD' of git://github.com/rwijaya/moodle

commit 0822174adc09f4c0ba83e8b0160cf92e65e761be
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Jun 2011 21:29:14 +0800
Tag:    v2.1.0

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

commit b28c4c22f3111dad9fc188a65daaa0b5ebb4f70e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Jun 2011 21:07:07 +0800
Tag:    v2.1.0

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

commit c5401e743d6a584f84307efab002073baef00e3b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Jun 2011 21:01:50 +0800
Tag:    v2.1.0

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

commit cddb4287221cda3213bd692a5dd9116778be7da9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Jun 2011 04:14:54 +0800
Tag:    v2.1.0

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

commit 34ff02bff07722539f3e305cad15a848300a8e11
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Jun 2011 23:31:42 +0800
Tag:    v2.1.0

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit 32038aaccc3ee839f9f9416bd2931922d0ddf94a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Jun 2011 23:12:40 +0800
Tag:    v2.1.0

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

commit 3bdc10150c8c3a959970b7d9489afea44432edd9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Jun 2011 21:56:03 +0800
Tag:    v2.1.0

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

commit 8e0733f4d81b705d23f66514ae14a658fa616191
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Jun 2011 20:06:13 +0800
Tag:    v2.1.0

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

commit f83776f2ec4541fa6e132d63a24e45675e06a291
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Jun 2011 16:11:02 +0800
Tag:    v2.1.0

Merge branch 'wip-MDL-27809-master-r7' of git://github.com/samhemelryk/moodle

commit a8e6c39e9f01e6a338894025af4bd49c069819fc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Jun 2011 07:44:40 +0800
Tag:    v2.1.0

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

commit 2e27e2d64a8ba9f1738f85a449eb0a912be6452f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 24 Jun 2011 06:31:53 +0800
Tag:    v2.1.0

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

commit 89ad7c078ed5b7e3022c144df43678281ec02e02
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 24 Jun 2011 06:21:58 +0800
Tag:    v2.1.0

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

commit 4965f02087c8f601a5ace3f5dfe6a58f53d2e2f4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 24 Jun 2011 06:13:48 +0800
Tag:    v2.1.0

Merge branch 's11_MDL-27999_wiki_preview_master' of github.com:dongsheng/moodle

commit 06c8cef4c2419fd7aaf70ba4f908f76aee43c49e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 24 Jun 2011 06:02:20 +0800
Tag:    v2.1.0

Merge branch 'wip-MDL-27962-master' of git://github.com/samhemelryk/moodle

commit fcb36b65ec39d8737da6b49915c076a399fd29e6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 24 Jun 2011 05:57:55 +0800
Tag:    v2.1.0

Merge branch 'wip-MDL-27958-master' of git://github.com/samhemelryk/moodle

commit adecb9de9a13088da6754d00b63228584cf163cf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 24 Jun 2011 05:54:32 +0800
Tag:    v2.1.0

Merge branch 'wip-MDL-27940-master' of git://github.com/samhemelryk/moodle

commit 916cbea67fe22adea9eb09f8581b765a687e1776
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 17:24:03 +0800
Tag:    v2.1.0

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit 5088275347a8ab056af85758fb34dde9e3aee8cc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 17:16:00 +0800
Tag:    v2.1.0

Merge branch 's10_MDL-27341_flickr_plugin_master' of git://github.com/dongsheng/moodle

commit 618d2ecf4884df0b52aa6b0de1ef01ec029dd2ae
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 16:15:07 +0800
Tag:    v2.1.0

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

commit 39354db055226b4451b99cf0dd808732c30f4c18
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 08:02:24 +0800
Tag:    v2.1.0

Merge branch 's10_MDL-27341_flickr_plugin_master' of git://github.com/dongsheng/moodle

commit 4c15bde8f1903817c6bec075cab86d64d19077b7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 07:14:19 +0800
Tag:    v2.1.0

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

commit daf4cf26f706508bfddbd35173452d1adead526c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 06:51:16 +0800
Tag:    v2.1.0

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

commit e345969ae20566ad386a73aad547c23fc8b39f6e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 06:46:29 +0800
Tag:    v2.1.0

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

commit e059fa90b1ada5d24824682f88764bdc99beeeed
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 06:43:11 +0800
Tag:    v2.1.0

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

commit 4d05c972ead2e82d46cc0a6e0ea8601e16e40893
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 06:37:13 +0800
Tag:    v2.1.0

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

commit a2854474ce69c01e2ff7d6d7d8c9d20dbbf711d2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 06:34:03 +0800
Tag:    v2.1.0

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

commit 63c4530f0fb8a4049da34d475d87d6951906c899
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 06:29:28 +0800
Tag:    v2.1.0

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

commit aad4048bd7a4ee4e2bd7cb22173bf22afc7ca029
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 06:25:27 +0800
Tag:    v2.1.0

Merge branch 'MDL-27196-hardcodedstrings' of git://github.com/mudrd8mz/moodle

commit d2a5e2278ced2f02ed1b17b77b360b7505fe3b18
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 20:27:46 +0800
Tag:    v2.1.0

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

commit f96147c291d47024535f274757a916fafa62c254
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 20:21:01 +0800
Tag:    v2.1.0

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

commit fc57ca6a546cf519219be18f216364c7f8473418
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 20:15:52 +0800
Tag:    v2.1.0

Merge branch 'MDL-27969-randomallocator' of git://github.com/mudrd8mz/moodle

commit 01acbc42e1c5775727748cf74af07ff66c2310de
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 20:11:18 +0800
Tag:    v2.1.0

Merge branch 'MDL-27073_multilang-custommenu' of git://github.com/mudrd8mz/moodle

commit 1e3ddd6bc41af3dbd082b4a811df4f62cec2c678
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 09:06:14 +0800
Tag:    v2.1.0

Merge branch 's10_MDL-27341_flickr_json_error_master' of git://github.com/dongsheng/moodle

commit 92f753eb99b17840ddbfb3d7ebbb66c53ce2eca3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 08:57:50 +0800
Tag:    v2.1.0

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

commit 96dc283b535f2f3fb084f13937f70c673d89eca2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 08:52:50 +0800
Tag:    v2.1.0

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

commit 80329900229e6f6f348762bd963ebacdb8c1d252
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 08:35:25 +0800
Tag:    v2.1.0

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

commit 555cc4b4a02d68bd48b5e9fce2288b334dde4f08
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 07:56:30 +0800
Tag:    v2.1.0

Merge branch 'wip-MDL-27810-master' of git://github.com/samhemelryk/moodle

commit 2fc832a1ae361910b8e69d0509502a1193458204
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 07:52:57 +0800
Tag:    v2.1.0

Merge branch 'MDL-27906_HEAD' of git://github.com/rwijaya/moodle

commit f5a6bf5e35e138af5d711eb251c887bb10e03bac
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 07:35:15 +0800
Tag:    v2.1.0

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

commit b3c1b5f1a684d51ae5a65fc55ac6d161d1ddfa0d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jun 2011 08:30:37 +0800
Tag:    v2.1.0

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit 9192e9fe45808f5bfa32e6552f07afb070e1325f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jun 2011 05:38:47 +0800
Tag:    v2.1.0

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

commit 5e811bb0007df178bc7d8d3f8d417b167783def7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jun 2011 00:44:08 +0800
Tag:    v2.1.0

Merge branch 's11_MDL-27941_partipants_page_master' of github.com:dongsheng/moodle

commit ca31e935e67d0531b0c088e875a31db8f971ea4b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jun 2011 00:38:42 +0800
Tag:    v2.1.0

Merge branch 'wip-MDL-27899-master' of git://github.com/samhemelryk/moodle

commit aed0dbe70a90ed7e3f492219ac2657b85efa0af6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Jun 2011 23:05:54 +0800
Tag:    v2.1.0

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

commit 8edbfba90969c96b88d5458cba73a31e7b8077d9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Jun 2011 18:48:55 +0800
Tag:    v2.1.0

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

commit 6f9297b48b1d76e669e0d8e9a10f7ddbf3e88fec
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Jun 2011 18:39:19 +0800
Tag:    v2.1.0

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

commit ee37607188a78826334034d9927fed8487b7f883
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Jun 2011 17:56:34 +0800
Tag:    v2.1.0

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

commit f2113d66cd4345c9db40a9dc95463765dcf481d5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Jun 2011 07:26:03 +0800
Tag:    v2.1.0

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

commit b9412668c4fcab20e3576c43f22e97bf25744841
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Jun 2011 07:21:18 +0800
Tag:    v2.1.0

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

commit fd8f24dba833ffc383403cad5446bd2d4c6c6492
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 18 Jun 2011 00:32:00 +0800
Tag:    v2.1.0

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

commit faf1f957acb1c62b46e95165ed7bec481ffdcba2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 17 Jun 2011 23:24:51 +0800
Tag:    v2.1.0

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

commit 3c158ff95e494a6b63cf40175e1fe3f801b9a2ea
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 17 Jun 2011 22:45:30 +0800
Tag:    v2.1.0

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

commit ff30976ad542d3b8be8a1111546f6a4dfdf81d32
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 17 Jun 2011 22:16:58 +0800
Tag:    v2.1.0

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

commit 5df6b3c87e780baf236fa234b510e169f484a335
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 17 Jun 2011 21:32:10 +0800
Tag:    v2.1.0

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

commit 5017d4dc7d7524b0718d307d757a7d87082e1eb5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 17 Jun 2011 21:30:16 +0800
Tag:    v2.1.0

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

commit 7035b80ad902b9fd566f56e5aaffcfe9f5498926
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 17 Jun 2011 07:06:07 +0800
Tag:    v2.1.0

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

commit 868ca72707c6c1c2d651b2459eb6711a11c906e6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 17 Jun 2011 01:03:16 +0800
Tag:    v2.1.0

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit 5c5f71172a24fd1fb008b91388bd15d35c226bb9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 16 Jun 2011 16:38:49 +0800
Tag:    v2.1.0

Merge branch 'wip-MDL-24355-master' of git://github.com/andyjdavis/moodle

commit 192026f6e503b27fa9b514aec1d7fa1dc9c23072
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 16 Jun 2011 00:18:26 +0800
Tag:    v2.1.0

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

commit 3420de9f978634528dc4aeb76c17b0816b3a650f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jun 2011 20:37:23 +0800
Tag:    v2.1.0

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

commit 84a5f2d26e34007bcdb647d6db2c8a8c14f8e889
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jun 2011 17:59:52 +0800
Tag:    v2.1.0

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

commit 07c4c12b8081597ed80da7cf9eb4c5b4b1bfb5bc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jun 2011 17:25:09 +0800
Tag:    v2.1.0

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

commit 17073fb53a35a991fa2522165795940a0f2fe01c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jun 2011 08:04:50 +0800
Tag:    v2.1.0

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

commit 31c7fbafa6e74d2e5f3b4291668a1d827c8fa335
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jun 2011 08:00:23 +0800
Tag:    v2.1.0

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

commit a16e137f21c42db1d43fb9894431fd47576eacd0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jun 2011 07:30:59 +0800
Tag:    v2.1.0

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

commit 5800c0fde1ebb712324e618ae06d15088c038db9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jun 2011 07:18:05 +0800
Tag:    v2.1.0

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

commit d55ecccb9b1085fa290394623b2690a7a1b02a02
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jun 2011 06:48:56 +0800
Tag:    v2.1.0

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

commit ee1235e7afe51b7a9d5c5933192108afc93d7147
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jun 2011 04:38:27 +0800
Tag:    v2.1.0

Merge branch 'backup-convert' of git://github.com/mudrd8mz/moodle

commit 90333a972e7e21b0ee814d47e5d9a8c8d677983f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jun 2011 22:57:36 +0800
Tag:    v2.1.0

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

commit b0635db22989a7e7288028f27eb10b0e94485df5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jun 2011 22:43:07 +0800
Tag:    v2.1.0

Merge branch 'MDL-25461-lang-install-link' of git://github.com/mudrd8mz/moodle

commit 260dd13064c61f0a9bf4d6ede5748f8ebcfe6170
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jun 2011 18:32:47 +0800
Tag:    v2.1.0

Merge branch 'wip-MDL-27825-master' of git://github.com/samhemelryk/moodle

commit e298ec5162f3cb39f74f7afc43ad2053cbb19e53
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jun 2011 18:11:54 +0800
Tag:    v2.1.0

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

commit a0be4a1fcb00ec98021ca63afb991fac208ff950
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jun 2011 01:52:49 +0800
Tag:    v2.1.0

Merge branch 'MDL-27065-workshop-categories' of git://github.com/mudrd8mz/moodle

commit 379f39eb9fd6fc48d34a420cab6d1fae73623860
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 13 Jun 2011 16:12:03 +0800
Tag:    v2.1.0

Merge branch 'MDL-27789-qe2plugins' of git://github.com/mudrd8mz/moodle

commit c7dbcc945203f0a860dbe0e00f9efea9b105cb0c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 09 Jun 2011 07:41:24 +0800
Tag:    v2.1.0

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

commit d92858291a2acd0940e0cde8df114effef1fb414
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 09 Jun 2011 07:20:54 +0800
Tag:    v2.1.0

Merge branch 'wip-MDL-27638-master' of git://github.com/samhemelryk/moodle

commit 2cb791ebc5c968e68bedf1ee57155b44f24f3c0e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 09 Jun 2011 06:59:11 +0800
Tag:    v2.1.0

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

commit 112c26e9ddf1b747ed8c0f20b2138a59bf0b0bc3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 09 Jun 2011 06:36:00 +0800
Tag:    v2.1.0

Merge branch 'wip-MDL-27676-master' of git://github.com/samhemelryk/moodle

commit a6b2f0faf207f42752c71e409f488e71e0f8baca
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 31 May 2011 06:58:34 +0800
Tag:    v2.1.0

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

commit 5b52ce19c5b3c66fcb6024f5add4b94d17308621
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 May 2011 22:37:43 +0800
Tag:    v2.1.0

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

commit 28e2b08582256076212f2c400d1969886d3aeb12
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 May 2011 16:16:10 +0800
Tag:    v2.1.0

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

commit 7a01a2d0cac339860ebc27ee9bd7dec3e740aebb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 23 May 2011 16:29:33 +0800
Tag:    v2.1.0

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

commit 79da959b55e8e9eb3e3a8ad92e4ab42595b5d14b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 May 2011 00:44:16 +0800
Tag:    v2.1.0

Merge branch 'wip-MDL-27192_MASTER' of git://github.com/jason-platts/moodle

commit 4d7e02616bc66ff2fdb5ca2a3ea55c4b17a64997
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 May 2011 20:19:23 +0800
Tag:    v2.1.0

Merge branch 'MDL-27386_HEAD2' of git://github.com/rwijaya/moodle

commit dcc26efb70fcd70ae66f03fb365bec1141d19238
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 May 2011 17:55:04 +0800
Tag:    v2.1.0

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

commit 14c3fd5f83620bb4211091b079e3f62737297aa3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 16 May 2011 15:23:42 +0800
Tag:    v2.1.0

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

commit bed4c52c6729d8536ea2e9c4fc0d1bf48922947a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 16 May 2011 08:45:51 +0800
Tag:    v2.1.0

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

commit 36da95632280260eaaecac1b417098f2c7a50b08
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 09 May 2011 23:46:22 +0800
Tag:    v2.1.0

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

commit 91a7cd842dd6347004f092e8881933c2ef0ed76c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 09 May 2011 08:04:34 +0800
Tag:    v2.1.0

Merge branch 'wip-MDL-27400-master' of git://github.com/samhemelryk/moodle

commit a8f60a4d586477f172f266831d418ec8b19740f6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 09 May 2011 07:58:38 +0800
Tag:    v2.1.0

Merge branch 'MDL-27317-variable-name-typos' of git://github.com/mudrd8mz/moodle

commit d1380a3c9a7989fdfff38254d3bfc0d4b3e00d1b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 09 May 2011 07:54:46 +0800
Tag:    v2.1.0

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

commit 3c1ee1042349ca5b23ba071267eae5b15ae39b76
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 09 May 2011 06:58:55 +0800
Tag:    v2.1.0

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

commit 327c24beea1020d71673e0680c997597f44dbff4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 06 May 2011 04:00:58 +0800
Tag:    v2.1.0

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

commit dd0ac53d7a32b5c8c1d9cecc82d986b7e1b5eaa3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 May 2011 22:08:59 +0800
Tag:    v2.1.0

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

commit 5f0ac7652b2fa9050b860b8081b0db1053e0838e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 May 2011 17:18:22 +0800
Tag:    v2.1.0

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

commit bff0e85d377d1b722ffe046c3006e33005dd5fb2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 May 2011 07:08:00 +0800
Tag:    v2.1.0

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

commit 069e955519234339e5272b180113f1fdc5635988
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 02 May 2011 22:14:05 +0800
Tag:    v2.1.0

Merge branch 'MDL-27293-customlang-timeout' of git://github.com/mudrd8mz/moodle

commit c0977cccd13b747ead34b45dbd069bd104b0401d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 02 May 2011 17:46:10 +0800
Tag:    v2.1.0

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

commit b90b28e2cb40cad6935de85d6da4e152faf369b8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Apr 2011 17:33:46 +0800
Tag:    v2.1.0

Merge branch 'w17_MDL-26249_m21_usercourses' of git://github.com/skodak/moodle

commit 0cd053b40b016431862723e03ed5778e37337ea6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Apr 2011 17:08:05 +0800
Tag:    v2.1.0

Merge branch 'w17_MDL-27253_m21_swfsize' of git://github.com/skodak/moodle

commit 0540e39af9801210fa9ed1671eb775f296fd0d47
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Apr 2011 17:04:39 +0800
Tag:    v2.1.0

Merge branch 'w17_MDL-27263_m21_loggedintypo' of git://github.com/skodak/moodle

commit ff6b4cdb6d7a910cdcb97da0e2594c411f5b0e82
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 18 Apr 2011 17:09:38 +0800
Tag:    v2.1.0

Merge branch 'MDL-26167-master' of git://github.com/agwells/moodle

commit e62ea95dfc05f76312c093b979b9d6099f2a852e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 18 Apr 2011 17:02:09 +0800
Tag:    v2.1.0

Merge branch 'w16_MDL-17344_m21_uploadprof' of git://github.com/skodak/moodle

commit 97fefd2386f6dc6820216e7bc77ffbf62941317e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 18 Apr 2011 07:15:56 +0800
Tag:    v2.1.0

Merge branch 'w16_MDL-27148_m21_stringinc' of git://github.com/skodak/moodle

commit dd92611ec5af147339641b7dc0937450c02bd9e4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 18 Apr 2011 07:10:29 +0800
Tag:    v2.1.0

Merge branch 'w16_MDL-27217_m21_tinyset' of git://github.com/skodak/moodle

commit 47f89dc8a623016275487125172fe0561812a092
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 18 Apr 2011 07:02:23 +0800
Tag:    v2.1.0

Merge branch 'w16_MDL-27220_m21_tagprofile' of git://github.com/skodak/moodle

commit 9ff913b716a55961c67ae4afe072a34995676d22
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Apr 2011 23:48:29 +0800
Tag:    v2.1.0

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

commit 72e97b58806a5a547d9547ac85a9bccf4b5bc15e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Apr 2011 21:55:33 +0800
Tag:    v2.1.0

Merge branch 'w15_MDL-26577_m21_groupscleanup' of git://github.com/skodak/moodle

commit af58cf7d4023e5b73998ca044dcd4de841249441
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Apr 2011 21:15:40 +0800
Tag:    v2.1.0

Merge branch 'w15_MDL-26805_m21_userpol' of git://github.com/skodak/moodle

commit 920234498ee3823a22d9dd36eb474a886aa8ecd6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Apr 2011 17:18:23 +0800
Tag:    v2.1.0

Merge branch 's9_MDL-27098_filemanager_strings_master' of git://github.com/dongsheng/moodle

commit 43f8192a656e8a525fe8a7c1e6077b007c75dce9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Apr 2011 17:06:30 +0800
Tag:    v2.1.0

Merge branch 'w15_MDL-25826_m21_htmlpurifier' of git://github.com/skodak/moodle

commit b34324a73e78c1122cac8bd138ced2aec8d2d6fd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Apr 2011 07:33:17 +0800
Tag:    v2.1.0

Merge branch 'w15_MDL-27094_m21_assval' of git://github.com/skodak/moodle

commit 11ea5b96a8f7711c8cdfb0d81871e178415ae07b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Apr 2011 07:20:41 +0800
Tag:    v2.1.0

Merge branch 'w15_MDL-27007_m21_userupload' of git://github.com/skodak/moodle

commit 90bf8b535bea0f3de49a898a162564e2b838879b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Apr 2011 06:14:05 +0800
Tag:    v2.1.0

Merge branch 'w15_MDL-26910_m21_httpd' of git://github.com/skodak/moodle

commit 12257f2c390d6d8daddd65641364c0600acc078b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Apr 2011 05:54:21 +0800
Tag:    v2.1.0

Merge branch 'w15_MDL-27121_m21_phpreq' of git://github.com/skodak/moodle

commit fa81a032572842cc169a64ae2fe5033fac999f2a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Apr 2011 05:51:26 +0800
Tag:    v2.1.0

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

commit b5f9a6d302e8b5437943187802b60ee43f200b2d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Apr 2011 05:41:01 +0800
Tag:    v2.1.0

Merge branch 'mdl27084' of git://github.com/tlevi/moodle

commit 21473e6cd746e44dfc1f25b036981238debf69f2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Apr 2011 05:21:49 +0800
Tag:    v2.1.0

Merge branch 'wip-MDL-26560-master' of git://github.com/samhemelryk/moodle

commit b76070db70a20e89899dc9c53eef89b411574cab
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Apr 2011 03:53:17 +0800
Tag:    v2.1.0

Merge branch 'wip-MDL-26858' of git://github.com/samhemelryk/moodle

commit a7174151dbcea35a2945045212d4a98e2c1a6231
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 04 Apr 2011 18:35:04 +0800
Tag:    v2.1.0

Merge branch 'MDL-11288-course-module-cloning' of git://github.com/mudrd8mz/moodle

commit 4102345add02ad399588763fd5ea9daff20ecb2b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 04 Apr 2011 18:00:30 +0800
Tag:    v2.1.0

Merge branch 'master' of git.moodle.org:/git/integration

commit a70ba1b0696f74c4a9992cc57ed0b09d9c89c054
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 04 Apr 2011 17:56:44 +0800
Tag:    v2.1.0

Merge branch 'MDL-26931-blog-post-order_master' of git://github.com/mudrd8mz/moodle

commit a5743e866eec902edffb602a9f84d55877df4405
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Mar 2011 05:33:23 +0800
Tag:    v2.1.0

Merge branch 'w13_MDL-22733_21_youtubeiframe' of git://github.com/skodak/moodle

commit 5e44c5c998b427246960f9d166d47cf3d905fed5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Mar 2011 04:08:15 +0800
Tag:    v2.1.0

Merge branch 'w13_MDL-26909_21_mediatests' of git://github.com/skodak/moodle

commit 12abf305f850a7721a9b92e9219bea04837a2778
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Mar 2011 03:56:25 +0800
Tag:    v2.1.0

Merge branch 'w13_MDL-26987_21_sclean' of git://github.com/skodak/moodle

commit 63d6da51fe7561e7ab51aaf1357adda3252cde5d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Mar 2011 01:58:49 +0800
Tag:    v2.1.0

Merge branch 'w13_MDL-26913_20_sitecreated' of git://github.com/skodak/moodle

commit 2326b8d3018d3f2c7d0bff84485115adff30cbf3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Mar 2011 01:38:48 +0800
Tag:    v2.1.0

Merge branch 'w13_MDL-26951_21_archetypes' of git://github.com/skodak/moodle

commit 18318237d741a7326ce88419823705498135bec1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Mar 2011 01:25:03 +0800
Tag:    v2.1.0

Merge branch 'w13_MDL-26991_21_legacy' of git://github.com/skodak/moodle

commit 0a284930cfb4100e453de6841a2afa6346a14715
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Mar 2011 01:05:07 +0800
Tag:    v2.1.0

Merge branch 'w13_MDL-26966_21_urlparsing' of git://github.com/skodak/moodle

commit 58937f7e577c621fe10bed268d73da5b9357829c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Mar 2011 00:09:29 +0800
Tag:    v2.1.0

Merge branch 'w13_MDL-26985_21_branching' of git://github.com/skodak/moodle

commit 37c2a8a0354d8f5929d6084a01589513da25b309
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 28 Mar 2011 22:21:11 +0800
Tag:    v2.1.0

Merge branch 'master' of git.moodle.org:/git/integration

commit a22672723806c734c2219fd5ea8ede6c01236f50
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 28 Mar 2011 22:07:20 +0800
Tag:    v2.1.0

Merge branch 'w13_MDL-26990_21_missingrebuild' of git://github.com/skodak/moodle

commit df8248b035c1f7a139bcd9693072930aac8a1eeb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 28 Mar 2011 20:48:38 +0800
Tag:    v2.1.0

Merge branch 'MDL-26804-langlistcache_master' of git://github.com/mudrd8mz/moodle

commit e1feb94cd1dcad7424ffdc9f141ee4604bc000af
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 28 Mar 2011 17:48:58 +0800
Tag:    v2.1.0

Merge branch 's8_MDL-26213_wiki_rewrite_file_url' of git://github.com/dongsheng/moodle

commit b431645c890a9c3fef3b8dab77d8f58b6bd0996e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 28 Mar 2011 17:03:44 +0800
Tag:    v2.1.0

Merge branch 'MDL-26932' of git://github.com/jennymgray/moodle

commit 12c6a556b2b4a0853d7e87ceafc20bd2fe8a362b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 28 Mar 2011 16:48:45 +0800
Tag:    v2.1.0

Merge branch 'm20_MDL-26939_plagiarism_restore' of git://github.com/danmarsden/moodle