Git merges in Moodle 2.0.2 by Eloy Lafuente (stronk7)
commit 78106a24addfd14c08602adbf7147f2eabf82bd4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Sat, 19 Feb 2011 01:42:45 +0800
Tag: v2.0.2
Merge branch 'em_MDL-25944_20_forummail' of git://github.com/skodak/moodle
commit 395181f9bb2813fe4f133237f003de2b78ae7b3d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Sat, 19 Feb 2011 01:25:18 +0800
Tag: v2.0.2
Merge branch 'master' of git.moodle.org:/git/integration
commit f5c452a3b342be92fd39aee6d56d44e4e2c82ec8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Sat, 19 Feb 2011 01:25:04 +0800
Tag: v2.0.2
Merge branch 'em_MDL-26476_20_grp' of git://github.com/skodak/moodle
commit 2e629eb861e20d3409c7fe2d26aaff8f81309f8a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Thu, 17 Feb 2011 04:51:12 +0800
Tag: v2.0.2
Merge branch 'w07_MDL-26452_20_resmess' of git://github.com/skodak/moodle
commit 534f22d14127dc2630af91870d3452cb1954103d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Wed, 16 Feb 2011 05:03:00 +0800
Tag: v2.0.2
Merge branch 'w07_MDL-26381_20_changepw' of git://github.com/skodak/moodle
commit c04c06dc8e63814c5dfeff0f415f1c947572a86b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Wed, 16 Feb 2011 02:26:21 +0800
Tag: v2.0.2
Merge branch 'MDL-25616_recent_messages' of git://github.com/andyjdavis/moodle
commit 07e21f6054566f73bb322935042fefc864087237
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 15 Feb 2011 23:45:22 +0800
Tag: v2.0.2
Merge branch 'w07_MDL-26211_20_https' of git://github.com/skodak/moodle
commit da622b497b0c443c2c07d1b9726d0ff97d3a34b8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 15 Feb 2011 19:40:43 +0800
Tag: v2.0.2
Merge branch 'w07_MDL-25778_20_defaultcity' of git://github.com/skodak/moodle
commit 9aaa767c80a3444205bc025daade77c8094e2103
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 15 Feb 2011 19:32:39 +0800
Tag: v2.0.2
Merge branch 'w07_MDL-26351_20_instquotes' of git://github.com/skodak/moodle
commit aabd2f0064de48ff7602c465676afdab772f946a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 15 Feb 2011 08:38:12 +0800
Tag: v2.0.2
Merge branch 'w07_MDL-24125_20_admintreecache' of git://github.com/skodak/moodle
commit b180a11998073ed08ea2b39061affe2fc0194a3f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 15 Feb 2011 08:16:33 +0800
Tag: v2.0.2
Merge branch 'MDL-26236' of git://github.com/timhunt/moodle
commit bcbb59022708b042a4a36501a12ea3897e455384
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 15 Feb 2011 08:03:23 +0800
Tag: v2.0.2
Merge branch 'MDL-26365' of git://github.com/timhunt/moodle
commit 46388c9cf97e9e67f705dd08369cd547307d8516
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 15 Feb 2011 07:58:01 +0800
Tag: v2.0.2
Merge branch 'MDL-26369' of git://github.com/timhunt/moodle
commit 2623f6bef2023458da31469460acdc50f926bcfe
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 15 Feb 2011 06:24:52 +0800
Tag: v2.0.2
Merge branch 'w07_MDL-25778_20_defaultcity' of git://github.com/skodak/moodle
commit 15ffec3698d1afc1d57b8ed2d474397c9167c934
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 15 Feb 2011 03:15:37 +0800
Tag: v2.0.2
Merge branch 'w07_MDL-25626_20_completionerror' of git://github.com/skodak/moodle
commit 89bf60cdbcf70f49dedc327459fdf77b1000383e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 15 Feb 2011 02:57:38 +0800
Tag: v2.0.2
Merge branch 'MDL-26338' of git://github.com/timhunt/moodle
commit 1ae279b448c7bac491087110c09a933dc95af6cd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 15 Feb 2011 01:29:46 +0800
Tag: v2.0.2
Merge branch 'MDL-26356' of git://github.com/ppichet/moodle
commit 68e05ea6e66ccda10c669fe734ef489830e159af
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 15 Feb 2011 01:26:33 +0800
Tag: v2.0.2
Merge branch 'MDL-26332' of git://github.com/timhunt/moodle
commit 69c53045ba7131306f3cfba9cc8194fec37d0873
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 15 Feb 2011 01:23:56 +0800
Tag: v2.0.2
Merge branch 'mdl-26299' of git://github.com/mackensen/moodle
commit 396dca7cb92927cbf7954adb8776cd850aad80cf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 15 Feb 2011 00:54:42 +0800
Tag: v2.0.2
Partially merge w07_MDL-25575_20_contexttrouble. See PULL-299
commit 7d871472033cacef466032075776868b479caed7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 15 Feb 2011 00:38:22 +0800
Tag: v2.0.2
Merge branch 'w07_MDL-26142_20_immediatelly' of git://github.com/skodak/moodle
commit 0dd8cb88e9993bf3e024327c272a9a257b4f4cd7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 15 Feb 2011 00:10:29 +0800
Tag: v2.0.2
Merge branch 'w07_MDL-23939_20_completeuser' of git://github.com/skodak/moodle
commit 76b7e2d1d61fbefe8792e619653ac4f97f4ceaa0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 14 Feb 2011 22:58:26 +0800
Tag: v2.0.2
Merge branch 'w07_MDL-26389_20_profile' of git://github.com/skodak/moodle
commit 4acc624d62da5b7be95f40d1ab3670416decc78e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 14 Feb 2011 22:06:28 +0800
Tag: v2.0.2
Merge branch 'w07_MDL-26131_20_collapsible' of git://github.com/skodak/moodle
commit f0e28c7e67fec3ec88b57cc0ba4c2c2cb5d77089
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 14 Feb 2011 21:38:02 +0800
Tag: v2.0.2
Merge branch 'w07_MDL-26223_20_calblock' of git://github.com/skodak/moodle
commit a49d8aa25ae732b614dbe82029a6e66e28ba0ec5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 14 Feb 2011 21:23:05 +0800
Tag: v2.0.2
Merge branch 'w07_MDL-25974_20_switchhidden' of git://github.com/skodak/moodle
commit 0db846acdad3b244e106907a068fcf66fda1a0ae
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 14 Feb 2011 19:41:16 +0800
Tag: v2.0.2
Merge branch 'w07_MDL-25998_20_enrolrole' of git://github.com/skodak/moodle
commit d2a201c83b966276bfbec09ad16796d59f9a7b95
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 14 Feb 2011 19:35:18 +0800
Tag: v2.0.2
Merge branch 'w07_MDL-26314_20_initcall' of git://github.com/skodak/moodle
commit 222a500b314e02449090c693c7636033ee431446
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 14 Feb 2011 19:31:50 +0800
Tag: v2.0.2
Merge branch 'w07_MDL-26383_20_blogupg' of git://github.com/skodak/moodle
commit 478d28181592e8c573b28ceb5bdc6304da5e8d4a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 14 Feb 2011 09:10:11 +0800
Tag: v2.0.2
Merge branch 'w07_MDL-26153_20_yuicombo' of git://github.com/skodak/moodle
commit 102cb3c1a6cfcc0c40d0c6ea446e918c6d0c5d20
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 14 Feb 2011 09:08:06 +0800
Tag: v2.0.2
Merge branch 'w07_MDL-26294_20_byteserving' of git://github.com/skodak/moodle
commit 0e9fe664b6f777b8e839400ff4f80bef8f13debb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 14 Feb 2011 09:00:19 +0800
Tag: v2.0.2
Merge branch 'w07_MDL-26307_20_dbport' of git://github.com/skodak/moodle
commit 64c74b8f7bd60f3340f0828da264c808af421dc0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 14 Feb 2011 08:53:45 +0800
Tag: v2.0.2
Merge branch 'w07_MDL-25626_20_completionerror' of git://github.com/skodak/moodle
commit 264184625d09bbd370609c0366b456b01c2ff1a2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 14 Feb 2011 08:50:55 +0800
Tag: v2.0.2
Merge branch 'w07_MDL-26355_20_installsize' of git://github.com/skodak/moodle
commit 378906a2730e3c24c8e875b7d0ee0a7ae4f2b57c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 14 Feb 2011 08:48:03 +0800
Tag: v2.0.2
Merge branch 'MDL-26274_rating_delete' of git://github.com/andyjdavis/moodle
commit 2e6bd88f3b25fcfe23ae92a53abe405b2d6b7f53
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 14 Feb 2011 08:44:08 +0800
Tag: v2.0.2
Merge branch 'w07_MDL-26376_20_shib' of git://github.com/skodak/moodle
commit 42bdecde6de02c8b50950fc659ddc01b947787ff
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 14 Feb 2011 08:41:19 +0800
Tag: v2.0.2
Merge branch 'w07_MDL-26380_20_mediafilterperf' of git://github.com/skodak/moodle
commit 64ff7d5c14c8dc1df14adef021b4c0314126fc4e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 14 Feb 2011 08:25:44 +0800
Tag: v2.0.2
Merge branch 'w07_MDL-26351_20_instquotes' of git://github.com/skodak/moodle
commit 345f4176dc72586a7c07871d562ce16513d63004
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 14 Feb 2011 08:09:07 +0800
Tag: v2.0.2
Merge branch 'w07_MDL-26030_20_mediafilter' of git://github.com/skodak/moodle
commit c87a7e44e891fad1b71cf166becd37b5f41646f9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 14 Feb 2011 07:56:02 +0800
Tag: v2.0.2
Merge branch 'w07_MDL-26379_20_minify' of git://github.com/skodak/moodle
commit c0d0dd4a5a4da3dba3457530907ee5b89dc5910a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 14 Feb 2011 07:52:09 +0800
Tag: v2.0.2
Merge branch 'w07_MDL-26352_20_metacourse' of git://github.com/skodak/moodle
commit 798e6fcba2e1d81a4d1a32c1e8c92e64ba23c39f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 14 Feb 2011 07:38:21 +0800
Tag: v2.0.2
Merge branch 'w07_MDL-26271_20_forumsearch' of git://github.com/skodak/moodle
commit b60f77ca29ff56c41da537905556009978dd010c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 14 Feb 2011 07:19:08 +0800
Tag: v2.0.2
Merge branch 'w07_MDL-26322_20_wantsurl' of git://github.com/skodak/moodle
commit cd03ecce8e704ce759292f6434a37274236ce1b1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 08 Feb 2011 17:21:55 +0800
Tag: v2.0.2
Merge branch 'MDL-24870_rss_error' of git://github.com/andyjdavis/moodle
commit 2f564be4e5d864b2b1e7ac632e8e48e4740ae02e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 08 Feb 2011 07:11:40 +0800
Tag: v2.0.2
Merge branch 'MDL-24355_20_tagcorrelations_rev1' of git://github.com/samhemelryk/moodle
commit 9597afb5721becbb65b6533d12740ac49997d1c0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 08 Feb 2011 05:26:33 +0800
Tag: v2.0.2
Merge branch 'MDL-26025' of git://github.com/samhemelryk/moodle
commit 5df4947cb8df8dedf6b40d37e0edccf4d0e9a8b8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 08 Feb 2011 05:21:21 +0800
Tag: v2.0.2
Merge branch 'w06_MDL-26234_20_customfields' of git://github.com/skodak/moodle
commit 9beb04e1d51a3c05c5cf7060a1fe49c3ded4e34a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 08 Feb 2011 04:56:07 +0800
Tag: v2.0.2
Merge branch 'w06_MDL-26290_20_mysqlport' of git://github.com/skodak/moodle
commit e32d5f9b88374fa2622bdfcb29f8786136b6b34d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 08 Feb 2011 04:41:04 +0800
Tag: v2.0.2
Merge branch 'w06_MDL-26256_20_collator' of git://github.com/skodak/moodle
commit 8fc84ff1c1f60c91c0ec51562005894aab6c84e2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 08 Feb 2011 03:22:29 +0800
Tag: v2.0.2
Merge branch 'w06_MDL-26219_20_upgradelog' of git://github.com/skodak/moodle
commit 20ba9a2e4729ddd73b16e8c7f3bc949333405aa0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 07 Feb 2011 22:53:15 +0800
Tag: v2.0.2
Merge branch 'MDL-17357-duplicate-strings' of git://github.com/mudrd8mz/moodle
commit 278de0eb52ce1ea06be9681e054430b2a37fab78
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 01 Feb 2011 16:35:49 +0800
Tag: v2.0.2
Merge branch 'MDL-25791_20_quizdb_rev1' of git://github.com/samhemelryk/moodle
commit 12fc00c951d4862e73b2f7ea6fcc03cf19045f8b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 01 Feb 2011 08:53:47 +0800
Tag: v2.0.2
Merge branch 'm20_MDL-25501_wiki_upgrade_improvement' of git://github.com/dongsheng/moodle
commit eb183178c82c77d4c2162ee1386d75471e452559
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 01 Feb 2011 03:10:27 +0800
Tag: v2.0.2
Merge branch 'w05_MDL-26034_20_myprofile' of git://github.com/skodak/moodle
commit 8e1ad9c60fcab36f3cfd8e3127af61becead20e7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 01 Feb 2011 02:14:55 +0800
Tag: v2.0.2
Merge branch 'm20_MDL-26201_forcejs' of git://github.com/danmarsden/moodle
commit 9f58e26db6459b674db8606c1839f204efc9b139
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 01 Feb 2011 01:02:02 +0800
Tag: v2.0.2
Merge branch 'w05_MDL-26046_20_noemailever' of git://github.com/skodak/moodle
commit e030faee3ea8925004fe37a8c79f5f5f85322eb9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 01 Feb 2011 00:43:22 +0800
Tag: v2.0.2
Take out debugging & merge branch 'w05_MDL-26198_20_completion' of git://github.com/skodak/moodle
commit 45289c3e79d545914fd6a3eb02f8d4f2db10e5b4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 01 Feb 2011 00:17:48 +0800
Tag: v2.0.2
Merge branch 'w05_MDL-26196_20_tags' of git://github.com/skodak/moodle
commit b6a0ec4238b74f1de8ccf6dd6c6754287f2be7a8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 31 Jan 2011 23:17:13 +0800
Tag: v2.0.2
Merge branch 'w05_MDL-26140_20_experimental' of git://github.com/skodak/moodle
commit d98c661428194abee054e2920fae228f5a714c9f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 31 Jan 2011 23:02:51 +0800
Tag: v2.0.2
Merge branch 'w05_MDL-26104_20_blockconflick' of git://github.com/skodak/moodle
commit 133a9b738eb797a9e166e3945ecfc363e2519f19
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 31 Jan 2011 23:01:02 +0800
Tag: v2.0.2
Merge branch 'w05_MDL-25921_20_tablemissing' of git://github.com/skodak/moodle
commit e89a57dc100ea1b6b1801d9d163a915a5ad2f51b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 31 Jan 2011 22:34:40 +0800
Tag: v2.0.2
Fixed conflicts & merge branch 'MDL-17201_index' of git://github.com/andyjdavis/moodle
commit 9700d6835df8c7fe00a18c1eed4e62de25623c37
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 31 Jan 2011 22:17:33 +0800
Tag: v2.0.2
Merge branch 'w05_MDL-26172_20_groupupgrade' of git://github.com/skodak/moodle
commit 7164db694c89c9fbec439e132e5416218372f5c6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 31 Jan 2011 21:57:22 +0800
Tag: v2.0.2
Merge branch 'w05_MDL-26189_20_imse' of git://github.com/skodak/moodle
commit 43bbf288494f7341345168ae558b2b83a267f1e2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 31 Jan 2011 19:33:16 +0800
Tag: v2.0.2
Merge branch 'w05_MDL-26182_20_nginx' of git://github.com/skodak/moodle
commit 29650825ade1af8a86e3aeb4019aa59cfa523fed
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 24 Jan 2011 18:55:57 +0800
Tag: v2.0.2
PULL-99, MDL-25929 progresstrackedroles out. Fixed conflicts and whitespace
commit 21c91e2e11f2ef9e2c5fa22a8e4a8e5521625fd5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 24 Jan 2011 17:48:08 +0800
Tag: v2.0.2
Merge branch 'wip-MDL-26044' of git://github.com/sammarshallou/moodle
commit 742d877eafa28239b4354ebf8b8d6a06afeb86e7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 11 Jan 2011 07:33:56 +0800
Tag: v2.0.2
Merge branch 'MDL-25793' of git://github.com/samhemelryk/moodle
commit ff14fd71fd6ac9f3d473ee2fd8cf0bf3bcb0d89b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 11 Jan 2011 06:20:30 +0800
Tag: v2.0.2
Merge branch 'MDL-24521' of git://github.com/samhemelryk/moodle
commit a9af868943a98301e7cbcb9a7395fdcca156ec39
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 11 Jan 2011 04:38:13 +0800
Tag: v2.0.2
Merge branch 'MDL-24561_forum_subscribe_sesskey' of git://github.com/mudrd8mz/moodle
commit a3c896ae4d17aa7338457d164b91e8d88f09567a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 11 Jan 2011 04:22:02 +0800
Tag: v2.0.2
Merge branch 'm20_MDL-25794_sections_typo' of git://github.com/danmarsden/moodle
commit a3b474ffa04981cc2e002cbfd027d68c759f9880
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 28 Dec 2010 00:55:35 +0800
Tag: v2.0.2
Merge branch 'wip-MDL-25370' of git://github.com/sammarshallou/moodle
commit 1ac3e1f20860b15a4b3cc5736b400dcafdbc518c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 27 Dec 2010 23:36:17 +0800
Tag: v2.0.2
Merge branch 'MDL-25720' of git://github.com/timhunt/moodle
commit e38610e4d46108c62b8974b8240f31897a8be127
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 27 Dec 2010 22:55:14 +0800
Tag: v2.0.2
Merge branch 'blog_MDL-25341_entry_sync' of git://github.com/andyjdavis/moodle