Developer credits

Git merges in Moodle 2.0.x by Eloy Lafuente (stronk7)

commit 2b8387bd1eb2415884e06a6d440299dcfef5836c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 25 Jun 2012 07:30:29 +0800
Tag:    v2.0.10

Merge branch 'w25_MDL-33733_m20_unzipstorage' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit b506964761e744b29f61a60542b89df4a795b6a5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 25 Jun 2012 00:29:30 +0800
Tag:    v2.0.10

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit b9043a5d7b8112502a2f7f3774553c53dbe9408e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jun 2012 08:55:52 +0800
Tag:    v2.0.10

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit f1cdf71eb62857c411a17b81b57d04aaa4a287fa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 01 Jun 2012 15:43:54 +0800
Tag:    v2.0.10

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 5356317a41b0d710a8cdb475179d7ac382096d27
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 19 May 2012 18:17:59 +0800
Tag:    v2.0.10

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit dcbe6a30ff854251efa5513a9329a73076d77e51
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 May 2012 18:11:11 +0800
Tag:    v2.0.9

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 1194a6b4850634a6196303cb78c37c4dcf272dae
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 10 May 2012 01:33:02 +0800
Tag:    v2.0.9

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 2151dfa877d811a28acfdfbc8c435e8de3abdeb6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 15 Mar 2012 18:42:33 +0800
Tag:    v2.0.9

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 8ef54b14bc6cd421c4e8cee419b39a8f0a4c400d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 09 Mar 2012 18:57:01 +0800
Tag:    v2.0.8

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit a0c01a21465843cb5d42fc078d8c01d2947ebcc2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 09 Mar 2012 18:04:37 +0800
Tag:    v2.0.8

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit f25d9a9f4d3e77703b6a7873783292e9db84c0c6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 09 Mar 2012 16:48:25 +0800
Tag:    v2.0.8

Merge branch 'wip-MDL-31248-MOODLE_20_STABLE-v3' of git://github.com/abgreeve/moodle into MOODLE_20_STABLE

commit f194dcf46a0345b60b1772e8e9aa90b4d125f455
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 08 Mar 2012 09:42:01 +0800
Tag:    v2.0.8

Merge branch 'wip-MDL-31248-MOODLE_20_STABLE-v2' of git://github.com/abgreeve/moodle into MOODLE_20_STABLE

commit cb8da175b73129ccfbe35e32a1a4eeb14c7c2f67
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 01 Mar 2012 18:26:36 +0800
Tag:    v2.0.8

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 4f3b7b7df3caba99515c520f88ae7af26c73dedc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Feb 2012 18:35:21 +0800
Tag:    v2.0.8

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 85cb510aba8434c1b945b3006e8fd17682293fa1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 17 Feb 2012 08:44:20 +0800
Tag:    v2.0.8

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit b5f59f54da4009fff3e5be55873217dcfbfa21b1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 27 Jan 2012 09:21:21 +0800
Tag:    v2.0.8

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 4c82d2b547311e82a7bf46e8cc26d1496952a779
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 19 Jan 2012 20:29:36 +0800
Tag:    v2.0.8

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit ca58cd28b00d2ca8bc72881c5886dcc122108c43
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 Jan 2012 19:38:11 +0800
Tag:    v2.0.8

Merge branch 'w03_MDL-31213_m20_attributesmess' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 0364409f8e64d5021f5d95eb5cd310ca02337a92
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 12 Jan 2012 18:27:33 +0800
Tag:    v2.0.8

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 8a99b2a116fada3e8f4e8d56fbf03fb723ef3cea
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 23 Dec 2011 09:53:35 +0800
Tag:    v2.0.7

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 139ce28030c397b3e0ed58b2917fd327ab4c1e8a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 20 Dec 2011 09:02:14 +0800
Tag:    v2.0.7

Merge branch 'MDL-30738_20_STABLE' of git://github.com/kiklop74/moodle into MOODLE_20_STABLE

commit 9f78a33c7b9dc08271bf0f9401ad1b9df2cf5bd1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 20 Dec 2011 07:05:59 +0800
Tag:    v2.0.7

Merge branch 'MDL-30741_m20' of git://github.com/jfilip/moodle into MOODLE_20_STABLE

commit 2ef91b5b555dee1228b9a1f143fa85ddaef341ff
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 14 Dec 2011 10:18:20 +0800
Tag:    v2.0.7

Merge branch 'wip-MDL-27767-m20' of git://github.com/samhemelryk/moodle into MOODLE_20_STABLE

commit 87690ba7567f29ca7ce4b9fd8adf2e5c475e5689
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 09 Dec 2011 23:20:49 +0800
Tag:    v2.0.7

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit b07c46d077c9324fbd863f11a84ec96e0fe38494
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 09 Dec 2011 02:23:57 +0800
Tag:    v2.0.7

Merge branch 'MDL-30658_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit a79d228de65b858c45b5118d6516adbfdbd551a6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 08 Dec 2011 08:37:37 +0800
Tag:    v2.0.7

Merge branch 'wip-MDL-30582-m20' of git://github.com/samhemelryk/moodle into MOODLE_20_STABLE

commit 30b29a5cfaa594c2a10f4380e63f06a3688c09dd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 08 Dec 2011 08:02:41 +0800
Tag:    v2.0.7

Merge branch 'MDL-26522_user_report_menu_20' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE

commit 2baa09dd5f72e41ffc130f0f09ebc3bf0c9130b7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 08 Dec 2011 07:45:54 +0800
Tag:    v2.0.7

Merge branch 'MDL-27314_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit 8f51baa885a409b776477444288ed513e77816bb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 08 Dec 2011 07:40:33 +0800
Tag:    v2.0.7

Merge branch 'wip-MDL-30222-m20' of git://github.com/samhemelryk/moodle into MOODLE_20_STABLE

commit 88ade60cf4d92d08e26036158bdfaae39aab8c3d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 08 Dec 2011 07:25:18 +0800
Tag:    v2.0.7

Merge branch 'w50_MDL-30595_m20_regex' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 4137a8c195a60daffccdda12ab33cb05263a2872
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 01 Dec 2011 19:04:35 +0800
Tag:    v2.0.7

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 6b04aaad266f523797d1cf6f83f145718d7ea351
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 01 Dec 2011 17:46:18 +0800
Tag:    v2.0.7

Merge branch 'MDL-30544_disable_notifications_20' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE

commit 027961fcf446fa38cf89820c03ba16532ff54d36
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 30 Nov 2011 02:50:09 +0800
Tag:    v2.0.7

Merge branch 'wip-mdl-30466-m20' of git://github.com/rajeshtaneja/moodle into MOODLE_20_STABLE

commit c42caf06ac5cf467d1886a26eff96f576f597627
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Nov 2011 10:18:28 +0800
Tag:    v2.0.7

Merge branch 'wip-MDL-30378-m20' of git://github.com/samhemelryk/moodle into MOODLE_20_STABLE

commit 4ad8c6e350295675afabec674fb21a2e812460b4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 28 Nov 2011 06:39:44 +0800
Tag:    v2.0.6

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit e16d680905cabe5cac12e020f4d2abb88688ec03
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 28 Nov 2011 06:18:39 +0800
Tag:    v2.0.6

Merge branch 'dropbox-api-bump-for-20_STABLE' of git://git.luns.net.uk/moodle into MOODLE_20_STABLE

commit 0c8697540c8fe955d8c94f903157c9f7580c5ebc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 25 Nov 2011 18:04:58 +0800
Tag:    v2.0.6

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 2a71a2648ee528b2fe6ceaa65555308e9fcd5e55
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 20:29:03 +0800
Tag:    v2.0.6

Merge branch 'wip-mdl-30375-m20' of git://github.com/rajeshtaneja/moodle into MOODLE_20_STABLE

commit 25641ce2da43ad79a14271e8d1bae26f83e2c53e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 18:49:17 +0800
Tag:    v2.0.6

Merge branch 'MDL-29060_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit 8a2ac4cb74e9f2724cec6f02e61d008a127d4a3f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 18:38:32 +0800
Tag:    v2.0.6

Merge branch 'wip-mdl-28947-m20' of git://github.com/rajeshtaneja/moodle into MOODLE_20_STABLE

commit ec4b3cbcae1f63207bfc8410b6e2990056bb82cc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 10:07:45 +0800
Tag:    v2.0.6

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

commit d112ae914f8acb41958b00518c36f28bdeb2642e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 10:02:40 +0800
Tag:    v2.0.6

Merge branch 'MDL-27045_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit 731e021f9ccabd0b6c80a7a295a6f93175521968
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 08:08:17 +0800
Tag:    v2.0.6

Merge branch 'MDL-30402-install-string_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit da7ab3476254725fb722da10eb3fa5c918b8a243
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 18 Nov 2011 03:18:38 +0800
Tag:    v2.0.6

Merge branch 'MDL-29350-MOODLE_20_STABLE-2' of git://git.luns.net.uk/moodle into MOODLE_20_STABLE

commit 991ee3344ad602f45f7238e5b5f86bfafe69255c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Nov 2011 08:23:08 +0800
Tag:    v2.0.6

Merge branch 'MDL-29743_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit 9fdd6c8bc886d1bbae0f97e11e96514a8e85cf91
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 15 Nov 2011 17:55:39 +0800
Tag:    v2.0.6

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit c8a5dfe0bdb2d380f171f1a074cb434ec75737db
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 Nov 2011 09:44:00 +0800
Tag:    v2.0.6

Merge branch 'MDL-29035-m20' of git://github.com/ankitagarwal/moodle into MOODLE_20_STABLE

commit 1739fe7331654efe40264958cb8a930b3a9580a9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 Nov 2011 09:34:32 +0800
Tag:    v2.0.6

Merge branch 'MDL-22351-M20' of git://github.com/lazydaisy/moodle into MOODLE_20_STABLE

commit 3d99c7ef9924c3b171f41fcfaa2e43ebc28d6fda
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 10 Nov 2011 08:34:05 +0800
Tag:    v2.0.6

Merge branch 'MDL-28426_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit 81a95b0185c07959f64c3e9bd2f69395dc3dc8b1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 10 Nov 2011 07:23:02 +0800
Tag:    v2.0.6

Merge branch 'MDL-30158-m20' of git://github.com/ankitagarwal/moodle into MOODLE_20_STABLE

commit 6733ba320d33cb065cbb70846d8227a2e494b0ba
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Nov 2011 22:57:09 +0800
Tag:    v2.0.6

Merge branch 'MDL-27542b_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE

commit 8a79a37526ed27e9cee5b3c72a043df23eb2ae34
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 03 Nov 2011 02:48:57 +0800
Tag:    v2.0.6

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 3db86da7bb531ae1bcbe416c60ee14a842d0036e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Nov 2011 02:55:52 +0800
Tag:    v2.0.6

Merge branch 'm20_MDL-29213' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE

commit 46fe9a9701b1fe16e0e0994cb090864973574ee6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 28 Oct 2011 00:49:26 +0800
Tag:    v2.0.6

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 9bec13184c3a024c8aabaa6789a7f01a913f4a68
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Oct 2011 05:15:04 +0800
Tag:    v2.0.6

Merge branch 'w42_MDL-29867_m20_author' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 87187e0ef9d9895948fc192229eaf288fdea6e92
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 20 Oct 2011 00:41:53 +0800
Tag:    v2.0.6

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 2092307abaece68f7394fc97f1b36fe12c45a4ea
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Oct 2011 17:02:30 +0800
Tag:    v2.0.6

Merge branch 'wip-MDL-29496-stable20' of git://github.com/phalacee/moodle into MOODLE_20_STABLE

commit 3065bfa1e1d181ff4255c855c3290ca62f2070e7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sun, 16 Oct 2011 23:38:37 +0800
Tag:    v2.0.6

Merge branch 'MDL-28483-m20' of git://github.com/ankitagarwal/moodle into MOODLE_20_STABLE

commit 9a31f96622d0e9963c409a8ebf84888d75610b0d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 07 Oct 2011 06:05:23 +0800
Tag:    v2.0.5

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 51acffb94a87d20862ee9f13a436789db54ecac6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Oct 2011 07:15:06 +0800
Tag:    v2.0.5

Merge branch 'MDL-28469_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit 74126d6d3e8797496adf8c48afec87e0ebb5deee
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Oct 2011 07:10:40 +0800
Tag:    v2.0.5

Merge branch 'wip-MDL-25697-m20' of git://github.com/samhemelryk/moodle into MOODLE_20_STABLE

commit d5ca7b11b71edc68f830619d90c5b5cf3b9be779
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Oct 2011 18:48:30 +0800
Tag:    v2.0.5

Merge branch 'MDL-27857-assignment-portfolio_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit 33091e7e582a48eb38728a4397b3678309371f46
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Oct 2011 18:13:09 +0800
Tag:    v2.0.5

Merge branch 'MDL-19575-m20' of git://github.com/ankitagarwal/moodle into MOODLE_20_STABLE

commit 0442a2387893939e84febf530799b117faf44ee8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 28 Sep 2011 17:04:44 +0800
Tag:    v2.0.5

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit fff222f460462df4ea03572367c091dd5a744c02
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 27 Sep 2011 05:57:51 +0800
Tag:    v2.0.5

Merge branch 'w38_MDL-29535_m20_filters' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit d2175fceaaf65f53d60d459b9b364176135383a7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 27 Sep 2011 04:42:43 +0800
Tag:    v2.0.5

Merge branch 'MDL-29462_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit aa114967bb41111facae2e17da5aec264e9897c6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 27 Sep 2011 04:37:51 +0800
Tag:    v2.0.5

Merge branch 'MDL-28202_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit e60ca6985b1c35ec7a1f0eef2835e2cf1b1bf431
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 27 Sep 2011 04:22:04 +0800
Tag:    v2.0.5

Merge branch 'MDL-29201_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit b506a6f08e88bce05f58b844942efe854467450f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 27 Sep 2011 03:45:15 +0800
Tag:    v2.0.5

Merge branch 'MDL-29528_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit 0ca9b41b50b740e6350d75feef63e34e89b13e60
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 21 Sep 2011 23:04:56 +0800
Tag:    v2.0.5

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 387bde00c25bbbeec1b369f360b5df5db4ffc339
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 21 Sep 2011 06:11:35 +0800
Tag:    v2.0.5

Merge branch 'MDL-26567_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit eebe41c9d3a2ff9202c9b1d8a3e95e5b08900296
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 20 Sep 2011 15:51:44 +0800
Tag:    v2.0.5

Merge branch 'wip-mdl-29079-m20' of git://github.com/rajeshtaneja/moodle into MOODLE_20_STABLE

commit 2bc77f9cc9a16adde417b6adb168e99c9339f4ca
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 20 Sep 2011 06:18:03 +0800
Tag:    v2.0.5

Merge branch 'wip-mdl-29079-m20' of git://github.com/rajeshtaneja/moodle into MOODLE_20_STABLE

commit 439de8cf42e096fc5165bdd7fec3fd3976621ba6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 20 Sep 2011 05:36:35 +0800
Tag:    v2.0.5

Merge branch 'MDL-29126_export_separator_20' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE

commit c1beb0fa2d3c3d053fcc547fec3b2e096ce3d41d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 20 Sep 2011 05:33:55 +0800
Tag:    v2.0.5

Merge branch 'MDL-27298_forum_rating_participants' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE

commit 77962f179e70d44c444807d3ee1843173a0539db
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 16 Sep 2011 07:34:52 +0800
Tag:    v2.0.5

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit f3266ff658943aa9dc19404cfd7a778e0e7b4508
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 06 Sep 2011 19:56:25 +0800
Tag:    v2.0.5

Merge branch 'wip-MDL-28043-m20' of git://github.com/samhemelryk/moodle into MOODLE_20_STABLE

commit bede2a2a3491b325baa2fcda413180f9b81fbb17
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 06 Sep 2011 08:00:12 +0800
Tag:    v2.0.5

Merge branch 'wip-mdl-28987-m20' of git://github.com/rajeshtaneja/moodle into MOODLE_20_STABLE

commit 85ae284e59ab87227eba2c1bb7e5c8715f98c8bc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 06 Sep 2011 07:28:28 +0800
Tag:    v2.0.5

Merge branch 'wip-mdl-23520-m20' of git://github.com/rajeshtaneja/moodle into MOODLE_20_STABLE

commit 029a753b91511ae8acc414052b23e535aa7284cd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 06 Sep 2011 06:38:55 +0800
Tag:    v2.0.5

Merge branch 'wip-MDL-29006-m20' of git://github.com/samhemelryk/moodle into MOODLE_20_STABLE

commit 724641e59a0617dd166e6a140a033605d606861a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 31 Aug 2011 07:29:52 +0800
Tag:    v2.0.5

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit b7424c7693e121c142f6bc0a6457aadd7a243bdc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2011 19:02:27 +0800
Tag:    v2.0.5

Merge branch 'MDL-29141_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit 081d16475ba905ed75e4d0cf6d2abd88a56abc77
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2011 16:31:34 +0800
Tag:    v2.0.5

Merge branch 'wip-MDL-24202-m20' of git://github.com/samhemelryk/moodle into MOODLE_20_STABLE

commit 22a35ffaafa6da64253a955389bb2fb6c62ab0c4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2011 09:23:45 +0800
Tag:    v2.0.5

Merge branch 'MDL-26302_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit 00f706d1f571e86176ae82b46157a038e56850f5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2011 08:53:08 +0800
Tag:    v2.0.5

Merge branch 'MDL-29064_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit 28883e9b4508bec8ceb15e0079dbf56126ff7640
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2011 07:22:58 +0800
Tag:    v2.0.5

Merge branch 'MDL-25872-20' of git://github.com/bostelm/moodle into MOODLE_20_STABLE

commit 6a10905864e6eceb0f5f01f1596487fda249a4c9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 26 Aug 2011 20:57:03 +0800
Tag:    v2.0.5

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit d52f9563d1027bd01ea31355159fe296113185c8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 25 Aug 2011 16:47:31 +0800
Tag:    v2.0.5

Merge branch 'MDL-27823_bulk_messaging_2_20' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE

commit de8c58715a5a32968f44a37e62010e8568286cc2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 25 Aug 2011 07:16:38 +0800
Tag:    v2.0.5

Merge branch 'MDL-28650-MOODLE_20_STABLE' of https://github.com/mouneyrac/moodle into MOODLE_20_STABLE

commit d45e51753816812be23fd19ba44cdef1abd5cb06
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 09:52:26 +0800
Tag:    v2.0.5

Merge branch 'w33_MDL-29022_m20_idnumber' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit d3ff99e7457f7fc8eb51a7961cb23ff40825bf8e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 00:43:56 +0800
Tag:    v2.0.5

Merge branch 'm20_MDL-28962' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE

commit 91d77b17bd454e98fa5dd9c94e08a1d2579fe175
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Aug 2011 23:31:45 +0800
Tag:    v2.0.5

Merge branch 'MDL-28397-20' of https://github.com/totara/moodle into MOODLE_20_STABLE

commit 68e22328b512973b28bb88c849e529970382e5d7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Aug 2011 08:50:21 +0800
Tag:    v2.0.5

Merge branch 'm20_MDL-28999' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE

commit 13c04d170127aafc439a2869bbcb25223024bb5e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Aug 2011 08:05:33 +0800
Tag:    v2.0.5

Merge branch 'w33_MDL-29031_m20_oldblock' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit bf3e4e030f3b93d148bdf42931973fa0446e674c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Aug 2011 07:42:48 +0800
Tag:    v2.0.5

Merge branch 'MDL-28226_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit f9356f85ce19df587bb20705c12be57724306139
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Aug 2011 07:20:37 +0800
Tag:    v2.0.5

Merge branch 'w33_MDL-28936_m20_msgstrlen' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit a25ae4ff1b46c6ae1fffd159b85848c726300580
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 18 Aug 2011 08:38:59 +0800
Tag:    v2.0.5

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 14f9c0cbcd99fd3cfada8dd2c2fd393b919dec42
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 18 Aug 2011 07:43:05 +0800
Tag:    v2.0.5

Merge branch 'm20_MDL-28971' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE

commit c7cce21d67f2ac392759c1144f3058930bdbc62a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 09:00:59 +0800
Tag:    v2.0.5

Merge branch 'wip-mdl-27219-m20' of git://github.com/rajeshtaneja/moodle into MOODLE_20_STABLE

commit be3aba207edbc0429e8e4e3c8315322603b24001
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 08:52:25 +0800
Tag:    v2.0.5

Merge branch 'MDL-28737_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit 780cdcea5fb23a5e4c4b44f7f41720767e460308
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 07:02:39 +0800
Tag:    v2.0.5

Merge branch 'MDL-27752_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE

commit c2fe54c2364efbe1b7cc7134f6e6a9b545f9c300
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 06:35:07 +0800
Tag:    v2.0.5

Merge branch 'm20_MDL-28649' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE

commit 664a07f74e9d2043d4040338698548c9e6224396
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 05:44:32 +0800
Tag:    v2.0.5

Merge branch 'm20_MDL-28721' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE

commit bf479611db9597ea99e0d3bb35807daa48d04292
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 19:17:12 +0800
Tag:    v2.0.5

Merge branch 'wip-MDL-26754-MOODLE_20_STABLE' of github.com:marinaglancy/moodle into MOODLE_20_STABLE

commit 1f52e72526c305989eadc702b5299edb2a50ac3c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 17:52:12 +0800
Tag:    v2.0.5

Merge branch 'MDL-23872_m20' of git://github.com/nebgor/moodle into MOODLE_20_STABLE

commit 9a287f8a49a1b4df0189f19c02aa6d1c4ad8a3f4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 09:06:31 +0800
Tag:    v2.0.5

Merge branch 'MDL-28931_m20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit 76a07a1da53c7b00bb91188b66f20715acffc050
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 08:15:18 +0800
Tag:    v2.0.5

Merge branch 'wip-mdl-27728-m20' of git://github.com/rajeshtaneja/moodle into MOODLE_20_STABLE

commit 46894c5058d45a925d5a8faeda302c7b86911f69
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 08:08:04 +0800
Tag:    v2.0.5

Merge branch 'MDL-27030_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit 75e815fe72d5132eb469d882e13587581822e3da
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 08:01:48 +0800
Tag:    v2.0.5

Merge branch 'wip-mdl-27896-m20' of git://github.com/rajeshtaneja/moodle into MOODLE_20_STABLE

commit 8634bb229e0566a09f28173323ddf46dab8776b7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 06:39:41 +0800
Tag:    v2.0.5

Merge branch 'm20_MDL-25757' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE

commit eac56e02bc30369bf3935d5eba933c6f29594d16
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 02:02:56 +0800
Tag:    v2.0.5

Merge branch 'm20_MDL-28603' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE

commit 6e4ece5640f6942d4fb94115fd1b48b9fffa12aa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 01:35:22 +0800
Tag:    v2.0.5

Merge branch 'MDL-28939_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit c8028c937154a5758628667751dc6763e5462de5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 12 Aug 2011 06:13:30 +0800
Tag:    v2.0.5

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 55ffbabe6d613a6551dd86a62a4603cca2f5431c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Aug 2011 04:59:47 +0800
Tag:    v2.0.5

Merge branch 'm20_MDL-28295' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE

commit e8a165d2a3255e0b0c5e6fa233b5046c8694cd4e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Aug 2011 08:49:28 +0800
Tag:    v2.0.5

Merge branch 'MDL-27550-workshop-feedback_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit fcda2530265eba9e1b9f9cb3665380d5e3186ff3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Aug 2011 08:37:32 +0800
Tag:    v2.0.5

Merge branch 'w31_MDL-27597_m20_catlike' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 2bdfe77686dae806514a05f7d5dba1aaec3a8c4c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Aug 2011 07:12:11 +0800
Tag:    v2.0.5

Merge branch 'wip-MDL-28407-m20' of git://github.com/samhemelryk/moodle into MOODLE_20_STABLE

commit 1b8b39cbde9dfba82ea9784c1604757f50a76c62
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Aug 2011 16:16:14 +0800
Tag:    v2.0.5

Merge branch 'MDL-28565_m20' of git://github.com/nebgor/moodle into MOODLE_20_STABLE

commit c874785067a231dffbd249a18ca8d1c73855f56c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Aug 2011 15:43:23 +0800
Tag:    v2.0.5

Merge branch 'MDL-28604_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit a53760ef5ab238c11f75c3af01e418c0c65ee485
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jul 2011 22:31:40 +0800
Tag:    v2.0.4

Merge branch 'm20_MDL-28017' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE

commit 8c5b86e044c95402eb4efc8f9031066800ffc3c7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jul 2011 18:23:19 +0800
Tag:    v2.0.4

Merge branch 'MDL-28210_messaging_constants_20_2' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE

commit 96651cf9ed24d65a7228d779e21277ad8d5ee8b8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jul 2011 02:29:01 +0800
Tag:    v2.0.4

Merge branch 'MDL-28251_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE

commit 583c465a3a9c3a7e0d2e9858b9fd3e77cb909ada
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jul 2011 01:48:54 +0800
Tag:    v2.0.4

Merge branch 'm20_MDL-26942' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE

commit 24f90eedb907e56e038d85c3b66edcd558b5bd62
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jul 2011 01:44:41 +0800
Tag:    v2.0.4

Merge branch 'MDL-27755_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE

commit 0d81404f9a39f0998d4392137c77b6c6f0a3a14a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jul 2011 01:36:16 +0800
Tag:    v2.0.4

Merge branch 'MDL-27741_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE

commit 15ffa46a1af64e96440497d7549bac044907c9cc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Jul 2011 22:27:04 +0800
Tag:    v2.0.4

Merge branch 'MDL-27483_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit 38bc3c281a345ec065a2017b8696b432a76af92f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Jul 2011 21:58:33 +0800
Tag:    v2.0.4

Merge branch 'MDL-27931_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE

commit 6761018805b76c28ae09fd3713f9f91ecbfda1bc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 08 Jul 2011 07:19:22 +0800
Tag:    v2.0.4

Merge branch 'MDL-28015-workshop-sql_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit 9948122905100141db8fd5865ac641ddd3a96aea
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 08 Jul 2011 06:58:24 +0800
Tag:    v2.0.4

Merge branch 'MDL-28168-custommenu_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit c1979ef02d59a4673b222eda06ef64a74a85c6f4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Jul 2011 16:38:44 +0800
Tag:    v2.0.4

Merge branch 'fix_import_search_course' of git://github.com/hit-moodle/moodle into MOODLE_20_STABLE

commit e3171137463fca4f819a3fc7ca933ebe22ca9ce8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Jul 2011 09:02:26 +0800
Tag:    v2.0.4

Merge branch 'm20_MDL-28110' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE

commit fea115dab35235b076b9c9a080cba2eb0435e281
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Jul 2011 08:23:33 +0800
Tag:    v2.0.4

Merge branch 'MDL-27989_MOODLE_20_STABLE' of git://github.com/kordan/moodle into MOODLE_20_STABLE

commit 4bd293ee63f403f259b7b89a3176ee21ac98cc77
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Jul 2011 01:26:56 +0800
Tag:    v2.0.4

Merge branch 'MDL-27040_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit c18a7f9d9432a367bcfb142e327ef26e43614a4b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Jul 2011 23:58:25 +0800
Tag:    v2.0.4

Merge branch 'MDL-28185_m20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit 07ca3c68163a6d9b1df4dbe5b7fe472e2df8d4aa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Jul 2011 23:48:30 +0800
Tag:    v2.0.4

Merge branch 'MDL-26618_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit 087a329eefe5974de4717e1615a4f4ffab2101db
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 02 Jul 2011 05:37:36 +0800
Tag:    v2.0.4

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 1dcb107bd441cf345fc913ac850d5d80bbbc2663
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 01 Jul 2011 07:38:44 +0800
Tag:    v2.0.4

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

commit f6c6bb4d39a582b5b51129c7ece0391f06ec178a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 23:12:31 +0800
Tag:    v2.0.4

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

commit add39c57dd21becd7c898e60534f6bd2424f96d4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 08:01:44 +0800
Tag:    v2.0.4

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

commit 1b024a0b51dfb62f5d5058bca24c265b14164f3e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 07:54:44 +0800
Tag:    v2.0.4

Merge branch 'MDL-15587-stable' of git://github.com/grabs/moodle into MOODLE_20_STABLE

commit 9d12edfcae25ca128a31f63fc4037f829ace30a6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 07:11:28 +0800
Tag:    v2.0.4

Merge branch 'm20_MDL-28016' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE

commit 8277c39c763a5b6c988e2a5aeb6981b73c74978a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Jun 2011 21:59:57 +0800
Tag:    v2.0.4

Merge branch 'MDL-27955_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE

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

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

commit 7cb1a84978197b480bcbd735592758878bad8599
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Jun 2011 06:55:29 +0800
Tag:    v2.0.4

Merge branch 'MDL-27922_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE

commit 4a8d589d411e61997916d41a57cfd58aa2ad18f1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 24 Jun 2011 06:23:03 +0800
Tag:    v2.0.4

Merge branch 'MDL-27827_stable' of git://github.com/grabs/moodle into MOODLE_20_STABLE

commit ffd06a7394657ba1c60850d4e97d9263238e0c67
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 24 Jun 2011 06:14:41 +0800
Tag:    v2.0.4

Merge branch 's11_MDL-27999_wiki_preview_20' of github.com:dongsheng/moodle into MOODLE_20_STABLE

commit ba55e33828b2bb6dca474266b760aa53334fb31f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 24 Jun 2011 05:58:21 +0800
Tag:    v2.0.4

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

commit 4a225b69bb15153e9ec105474b9a9d487a10f988
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 17:24:19 +0800
Tag:    v2.0.4

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 727242750d62802853b07fb2aa786b58f95eca02
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 17:16:34 +0800
Tag:    v2.0.4

Merge branch 's10_MDL-27341_flickr_plugin_20' of git://github.com/dongsheng/moodle into MOODLE_20_STABLE

commit 1bef145b49ff0bfa45dacc9819f2a21fc13c1f6e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 16:19:13 +0800
Tag:    v2.0.4

Merge branch 'MDL-27920_grade_export_20' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE

commit 177f14d6f6c6589b5adc56052a685c7fc95ae7b5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 08:05:45 +0800
Tag:    v2.0.4

Merge branch 's10_MDL-27341_flickr_plugin_20' of git://github.com/dongsheng/moodle into MOODLE_20_STABLE

commit bdcea1a221dacb9d7095dc216519155cf6aa2e61
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 06:26:09 +0800
Tag:    v2.0.4

Merge branch 'MDL-27196-hardcodedstrings_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit 26a92149cc00c2d6c9118893411e48c914e1e068
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 20:28:36 +0800
Tag:    v2.0.4

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

commit 38961259dea1c732f3e65191c71e8b72a35b059d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 20:16:41 +0800
Tag:    v2.0.4

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

commit 528cde2db247777c7da2ee54ea2064a6d9a12914
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 20:12:11 +0800
Tag:    v2.0.4

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

commit 2c85a824fcf49ea688e7d188aa772827cd039fbd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 09:07:26 +0800
Tag:    v2.0.4

Merge branch 's10_MDL-27341_flickr_json_error_20' of git://github.com/dongsheng/moodle into MOODLE_20_STABLE

commit 6ce26b03e75cd2cb54f148a6969b2031c1752366
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 09:00:41 +0800
Tag:    v2.0.4

Merge branch 'MDL-27860_2.0' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit 5def8d573dda3cb4863a877894b70598a27b7eda
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 08:36:05 +0800
Tag:    v2.0.4

Merge branch 'MDL-26948_2.0' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit c06e87a41070bb77151a9f0e043fcf137bd4c9fc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 17 Jun 2011 01:04:49 +0800
Tag:    v2.0.4

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit db005da178c3fc9aab78822c7e76569770adaf89
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 16 Jun 2011 16:39:48 +0800
Tag:    v2.0.4

Merge branch 'MDL-24355-MOODLE_20_STABLE2' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE

commit a9e0bc82fb61b9c2198cde6d96ac7db4ec403e78
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jun 2011 17:30:15 +0800
Tag:    v2.0.4

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

commit b5e8919b7caceddb9f70a8f1f533e2f67ece5713
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jun 2011 07:18:33 +0800
Tag:    v2.0.4

Merge branch 'm20_MDL-27858' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE

commit 397262e292c63175bb62fe7ed33603689c31d202
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jun 2011 06:55:08 +0800
Tag:    v2.0.4

Merge branch 'MDL-27848_for_MOODLE_20_STABLE' of git://github.com/kordan/moodle into MOODLE_20_STABLE

commit 87c8b752cac92409dbb1cbdecdcc5f2a423b33da
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jun 2011 23:01:56 +0800
Tag:    v2.0.4

Merge branch 'wip-MDL-27759-MOODLE_20_STABLE' of git://github.com/rajeshtaneja/moodle into MOODLE_20_STABLE

commit 4fcc689dfcef9ef3691643e33f57f51888a03608
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jun 2011 18:30:55 +0800
Tag:    v2.0.4

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

commit 27f31cc626a10dbeff3da0a8b90c31ce504b9dbc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jun 2011 18:12:57 +0800
Tag:    v2.0.4

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

commit c5b9fe0ddad8c1b3bcfcc037957ebcbeffc31c6d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 09 Jun 2011 09:38:54 +0800
Tag:    v2.0.4

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 07511dbe6df6e1cd356d2bed976c99d8a8d6050b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 09 Jun 2011 07:23:30 +0800
Tag:    v2.0.4

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

commit df70dfe4eebb06a6801b9676f60a4777f7c20402
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 09 Jun 2011 07:10:27 +0800
Tag:    v2.0.4

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

commit f872b32778abc6af36c0c285c9e91a362d02a975
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 09 Jun 2011 06:36:33 +0800
Tag:    v2.0.4

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

commit 0a770d5c6c706b4c888a37072b19064c1fc68baf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 03 Jun 2011 05:28:02 +0800
Tag:    v2.0.4

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit b5e1c2e748008d39914b15a63d114d3cf5a74b79
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 31 May 2011 07:01:24 +0800
Tag:    v2.0.4

Merge branch 'MDL-25191-m20' of git://github.com/sammarshallou/moodle into MOODLE_20_STABLE

commit 4e184a9ce62e944c70be51ccd10ff64faf013cda
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 26 May 2011 06:14:02 +0800
Tag:    v2.0.4

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 36420f78c1c7658c8d6c5c71cd2f166130b6fb12
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 May 2011 22:38:48 +0800
Tag:    v2.0.4

Merge branch 'MDL-27625_20stable' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit 19ab387d068106cd2ae5b9bd06d10ed078b1d928
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 May 2011 00:49:49 +0800
Tag:    v2.0.4

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

commit e56ac08a5cf73a19142bb4bd774f2951743fc4e6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 May 2011 20:28:55 +0800
Tag:    v2.0.4

Merge branch 'MDL-27386_m20_b' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE

commit e1ad9ae4f5fe3ddf39d66d7f5c0c7ff989604fd4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 May 2011 18:00:10 +0800
Tag:    v2.0.4

Merge branch 'MDL-26704_user_outline_report' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE

commit 890c7fae4ef305275afc63e2df7cc4e48f1be6f9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 16 May 2011 15:26:29 +0800
Tag:    v2.0.4

Merge branch 'MDL-26436_close_recordsets3' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE

commit 9ae0b69f59829c6d91c5b06563185cdab74a3c2e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 16 May 2011 08:46:52 +0800
Tag:    v2.0.4

Merge branch 'MDL-26436_close_recordsets2' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE

commit 2430319b523b60031647a2d5596a8eb26ffa1c3d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 09 May 2011 23:47:47 +0800
Tag:    v2.0.4

Merge branch 'MDL-27401-m20' of git://github.com/sammarshallou/moodle into MOODLE_20_STABLE

commit 30dc7311adf2cb0380229190a8afee923bc4b076
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 09 May 2011 08:13:26 +0800
Tag:    v2.0.4

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

commit 9784520acba47cda3b1744c1e016667880dc5efb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 09 May 2011 07:55:39 +0800
Tag:    v2.0.4

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

commit d015c2352ffcdb8439b93e2cb4d2fd2b46c4df21
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 09 May 2011 07:01:44 +0800
Tag:    v2.0.4

Merge branch 'MDL-27391-m20' of git://github.com/sammarshallou/moodle into MOODLE_20_STABLE

commit b911ab236cc7aa1c58a7a9d79575c9e35c8d6e98
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 May 2011 22:09:44 +0800
Tag:    v2.0.3

Merge branch 'MDL-25594-20' of git://github.com/srynot4sale/moodle into MOODLE_20_STABLE

commit 78cc7bee627083be73ec69e82e76fc4793d2cbaa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 May 2011 17:21:02 +0800
Tag:    v2.0.3

Merge branch 'MDL-26788_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE

commit 98032d512d680a705e78c72076ebe5700ec7598a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 02 May 2011 22:19:40 +0800
Tag:    v2.0.3

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

commit 656237dd558792032df3bf214301e00655eb2564
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 02 May 2011 18:26:22 +0800
Tag:    v2.0.3

Merge branch 'MDL-26714_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit 52435228c5fd46d08505ddd2323cf1fb15a0d31a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Apr 2011 17:15:01 +0800
Tag:    v2.0.3

Merge branch 'w17_MDL-27253_m20_swfsize' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit c9dc3e55644f737f2d13e456948064d26ef5c954
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Apr 2011 17:06:31 +0800
Tag:    v2.0.3

Merge branch 'w17_MDL-27263_m20_loggedintypo' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 436f83f8ff1c2f8c09ded9dc51425b29a012ca61
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 18 Apr 2011 17:44:02 +0800
Tag:    v2.0.3

Merge branch 'MDL-26167-stable' of git://github.com/agwells/moodle into MOODLE_20_STABLE

commit 15a6af91f5d584da408d85d10fac58746967ce04
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 18 Apr 2011 17:07:42 +0800
Tag:    v2.0.3

Merge branch 'w16_MDL-17344_m20_uploadprof' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 60bc533ee81f9a74360adb2f1403e16fea92a01b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 18 Apr 2011 07:44:10 +0800
Tag:    v2.0.3

Merge branch 'w16_MDL-27148_m20_stringinc' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 42f2b8d0dd0c4c9e0ee9030b2bf44266fb94f3d3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 18 Apr 2011 07:13:49 +0800
Tag:    v2.0.3

Merge branch 'w16_MDL-27217_m20_tinyset' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 84047d1fc9653f3dfe91c200b5dda2d9f867dd11
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 18 Apr 2011 07:08:10 +0800
Tag:    v2.0.3

Merge branch 'w16_MDL-27220_m20_tagprofile' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit d7706bac2cc63634d21dba56ed3e72b3cede09a5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Apr 2011 23:54:21 +0800
Tag:    v2.0.3

Merge branch 'MDL-26778-m20' of git://github.com/sammarshallou/moodle into MOODLE_20_STABLE

commit 391e054c03498066c18c94df279f76e7402e94fa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Apr 2011 22:02:10 +0800
Tag:    v2.0.3

Merge branch 'w15_MDL-26577_m20_groupscleanup' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 71f2316fe6230f8a5b98effbe66205b5462df9a8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Apr 2011 21:18:31 +0800
Tag:    v2.0.3

Merge branch 'w15_MDL-26805_m20_userpol' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 37efb4f1eeaafc92af4a8054f4735db37daa6f45
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Apr 2011 17:20:31 +0800
Tag:    v2.0.3

Merge branch 's9_MDL-27098_filemanager_strings_20' of git://github.com/dongsheng/moodle into MOODLE_20_STABLE

commit 8fa13d155d2b3bd51cbc3689b3c46faafaaf668b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Apr 2011 17:08:23 +0800
Tag:    v2.0.3

Merge branch 'w15_MDL-25826_m20_htmlpurifier' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 3d62a46b26c3af5cd83fb064ec9b91598f0df218
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Apr 2011 07:32:15 +0800
Tag:    v2.0.3

Merge branch 'w15_MDL-27094_m20_assval' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 9aacfedb22a8266ce771d81b0d6304446e47590d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Apr 2011 07:23:04 +0800
Tag:    v2.0.3

Merge branch 'w15_MDL-27007_m20_userupload' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 12b734434bcb68806a71f108c1ebeeb60ce99bfc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Apr 2011 06:17:23 +0800
Tag:    v2.0.3

Merge branch 'w15_MDL-26910_m20_httpd' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit f9068e531cc3d89620ec8d72f4cbf8f898523d12
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Apr 2011 05:55:11 +0800
Tag:    v2.0.3

Merge branch 'w15_MDL-27121_m20_phpreq' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 96506c474a9d7e42f31749476fe99c5e6b097b1b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Apr 2011 05:49:59 +0800
Tag:    v2.0.3

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

commit ddf3e875f3712c7c8ed0c7d307709c242e7a37fe
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Apr 2011 05:16:53 +0800
Tag:    v2.0.3

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

commit 91fa7abf3deb95f81988be78429e97db1f840d18
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Apr 2011 03:50:22 +0800
Tag:    v2.0.3

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

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

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

commit 09c1e72a568d6bbff660cb13d22b8513c6ddbd51
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Mar 2011 05:56:08 +0800
Tag:    v2.0.3

Merge branch 'MDL-26744-metasyncstring_20_STABLE' of git://github.com/wildgirl/moodle into MOODLE_20_STABLE

commit d2455301b786c8f2599db6f6b8f54d5f0b69407c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Mar 2011 05:53:40 +0800
Tag:    v2.0.3

Merge branch 'w13_MDL-22733_20_youtubeiframe' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 1be2b904abb43403b993bd10db6428c3dde0498f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Mar 2011 05:30:35 +0800
Tag:    v2.0.3

Merge branch 'w13_MDL-26909_20_mediatests' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 337817e669030b94612d97e64c1a1bb59da76850
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Mar 2011 03:59:21 +0800
Tag:    v2.0.3

Merge branch 'w13_MDL-26987_20_sclean' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit b17a3a55917b73cfdf36b39f7a56fbd6697b449f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Mar 2011 02:10:57 +0800
Tag:    v2.0.3

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

commit c44c552efa66c0f508dcee80cc463ed88a5ecb35
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Mar 2011 01:40:35 +0800
Tag:    v2.0.3

Merge branch 'w13_MDL-26951_20_archetypes' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit faa297ce6f7023ded55d6d788c642369afd98deb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Mar 2011 01:26:28 +0800
Tag:    v2.0.3

Merge branch 'w13_MDL-26991_20_legacy' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit b6225c0f2f85d526c466293b8947f9d620302135
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Mar 2011 01:07:00 +0800
Tag:    v2.0.3

Merge branch 'w13_MDL-26966_20_urlparsing' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 50496af78b3a604e1a58b1b90e2748cf13c8f1f6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Mar 2011 00:41:22 +0800
Tag:    v2.0.3

Merge branch 'w13_MDL-26985_20_branching' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 3ede344b5c623e4226d6e1a8b436d0b041ba8d94
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 28 Mar 2011 22:35:18 +0800
Tag:    v2.0.3

Merge branch 'w13_MDL-26990_20_missingrebuild' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit c6f7c3e7f3f2ec965a6401f278b207a5735c0c3d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Mar 2011 04:56:46 +0800
Tag:    v2.0.3

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

commit bc35885cb4755fa966dc38fb70a0490e09ee1d33
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Mar 2011 04:54:57 +0800
Tag:    v2.0.3

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

commit b9c6ce2d19f65aff0614d4ed9a0b397f2b7fbc65
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Mar 2011 04:38:23 +0800
Tag:    v2.0.3

Merge branch 'm20_MDL-26905_AICC_API_missing_currentorg_init' of git://github.com/scara/moodle

commit bf1a4d75e01630a6eb2875b995e0c44ecc61a422
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Mar 2011 04:34:17 +0800
Tag:    v2.0.3

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

commit 8c2e4c90d71d274cdeff3e8b08c5af174fc41268
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Mar 2011 04:32:50 +0800
Tag:    v2.0.3

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

commit be5eb0013ea262ce709fb69eac452e7afc8ee1b8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Mar 2011 04:15:54 +0800
Tag:    v2.0.3

Merge branch 'MDL-26863_wrong_appendtolog_statement' of git://github.com/scara/moodle

commit c031f2c1e7388c3fd60266777d9bb7b969bb2d53
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Mar 2011 04:10:55 +0800
Tag:    v2.0.3

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

commit 63187a688768ff51859ebb7eec1c422b8f37e815
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Mar 2011 04:03:15 +0800
Tag:    v2.0.3

Merge branch 'm20_MDL-26894_SCORM13_PHP_notice_undefined_prop_id' of git://github.com/scara/moodle

commit 1595b8120fdc459c15b0c217d465e582e73312ec
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Mar 2011 03:59:32 +0800
Tag:    v2.0.3

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

commit 4c2ce98b42fc4975ba93f844da5e93beeace7b21
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Mar 2011 03:55:20 +0800
Tag:    v2.0.3

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

commit 83ee4693c5cae75a36b8475692386bc94fac4bf6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Mar 2011 02:08:46 +0800
Tag:    v2.0.3

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

commit 4386e0d1019f1b04b13339cc93fd7b9c650c2638
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Mar 2011 01:04:25 +0800
Tag:    v2.0.3

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

commit 1f95c9a4afdb1c6ccbd41b6cc6821b92b59ceb16
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Mar 2011 00:55:40 +0800
Tag:    v2.0.3

Merge branch 'w12_MDL-26842_20_ociparams' of git://github.com/skodak/moodle

commit 1997d9dc1d3c58b9b42357d91bc60910cbb67766
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 21 Mar 2011 23:38:19 +0800
Tag:    v2.0.3

Merge branch 'w12_MDL-26842_20_ociparams' of git://github.com/skodak/moodle

commit c0c232ab63790399f6ae071dbcaeb7b367bb28d5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 21 Mar 2011 23:31:27 +0800
Tag:    v2.0.3

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

commit 7a5852c857f2099f100c7c4dba88207ec1d4ea91
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 21 Mar 2011 22:35:17 +0800
Tag:    v2.0.3

Merge branch 'w12_MDL-26844_20_limittests' of git://github.com/skodak/moodle

commit e5e64a4886b9babe30bbd2c33cacb56a57b62401
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 15 Mar 2011 22:21:02 +0800
Tag:    v2.0.3

Merge branch 'w11_MDL-26697_20_media' of git://github.com/skodak/moodle

commit 6326817e0f0e49cb4e3950b89c30fc0b625d2016
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Mar 2011 19:07:41 +0800
Tag:    v2.0.3

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

commit 3d63eb08f6f4b556034f0026212b96b171c2dc99
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Mar 2011 19:03:36 +0800
Tag:    v2.0.3

Merge branch 'MDL-22478-alternative-langcacheroot' of git://github.com/mudrd8mz/moodle

commit 64f3208b7c3955424dac232e22c1c1fa651f6db5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Mar 2011 09:12:46 +0800
Tag:    v2.0.3

Merge branch 'w11_MDL-26698_20_helphttps' of git://github.com/skodak/moodle

commit 3c38ad5d796b122dfc2f267cf85d6e11b4f874cf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Mar 2011 08:57:08 +0800
Tag:    v2.0.3

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

commit 98fd7dcb72a3a4c43ff0e45d08a5af6adca36095
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Mar 2011 08:53:29 +0800
Tag:    v2.0.3

Merge branch 'w11_MDL-24071_20_tex' of git://github.com/skodak/moodle

commit b8f249b43a1f989759d8ec6cd5e22f082cf9ccba
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Mar 2011 08:26:22 +0800
Tag:    v2.0.3

Merge branch 'w11_MDL-26634_20_ldapsep' of git://github.com/skodak/moodle

commit 9f091bcd45595ab18be9b95e53496e94d3f76094
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Mar 2011 08:22:10 +0800
Tag:    v2.0.3

Merge branch 's7_MDL-9376_qaforum' of git://github.com/dongsheng/moodle

commit 5869d05bb7837ccaaabbc29a6a87f7e5f5c48e36
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Mar 2011 08:10:35 +0800
Tag:    v2.0.3

Merge branch 'w11_MDL-25352_20_replace' of git://github.com/skodak/moodle

commit 2b1a23a6aad1a8e7d5dfffc2d842726e8cd839b2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Mar 2011 07:54:36 +0800
Tag:    v2.0.3

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

commit d47070248f7c666864b4555222115b3920c6871c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Mar 2011 07:53:28 +0800
Tag:    v2.0.3

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

commit 6bfddc2e384659c68486b1a69e03b87b0302bc17
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Mar 2011 07:49:11 +0800
Tag:    v2.0.3

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

commit 7e0579cb8c4ef2caa32fc4094f4aa74e703f4444
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Mar 2011 07:43:58 +0800
Tag:    v2.0.3

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

commit 99294459266dbc3da9ab6973d57e1b2c3c0bfedf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Mar 2011 07:35:03 +0800
Tag:    v2.0.3

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

commit f934143c6cf78edef47c29f4275fc1ccac67594c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Mar 2011 07:32:01 +0800
Tag:    v2.0.3

Merge branch 'AMOS-install-strings' of git://github.com/mudrd8mz/moodle

commit e9579e548de070bdcd5c3ef5a395fffa5814ae64
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Mar 2011 07:25:04 +0800
Tag:    v2.0.3

Merge branch 'w11_MDL-26621_20_profilemail' of git://github.com/skodak/moodle

commit 5cd0d27089c766cb35eca7f854560f5dcac4b268
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Mar 2011 06:50:20 +0800
Tag:    v2.0.3

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

commit b5686d021b46e5f59b0672d6b18fa53e580b9a46
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Mar 2011 06:41:48 +0800
Tag:    v2.0.3

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

commit d93c27ec95ca20b7305cc949e89ef706dd258e17
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Mar 2011 06:33:09 +0800
Tag:    v2.0.3

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

commit 908b892d9ccc7f53dbb98d60cd9881ae8d3d0977
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Mar 2011 06:31:05 +0800
Tag:    v2.0.3

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

commit 22acfde0768e58e64c28fd68a64eb96cc9d5e8f2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Mar 2011 06:28:07 +0800
Tag:    v2.0.3

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

commit 40b204b8636211d6c6b15736c356c91622ed72d1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Mar 2011 06:22:04 +0800
Tag:    v2.0.3

Merge branch 'wip-MDL-26606' of git://github.com/sammarshallou/moodle

commit 4f7fd61a7a2d499980d12af4d7e7bfb61c16b7bc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Mar 2011 05:57:06 +0800
Tag:    v2.0.3

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

commit 97b4297e13ae4ed19019a565ee93f55f4f7d157c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 07 Mar 2011 21:49:17 +0800
Tag:    v2.0.3

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

commit 5f9f0717fe8770eb498ee6bce79c47cb337c54f5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 07 Mar 2011 18:49:28 +0800
Tag:    v2.0.3

Merge branch 'MDL-26609-version-maturity' of git://github.com/mudrd8mz/moodle

commit 9f3813016cd6536c173368e399451fe0f4cdee5e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 07 Mar 2011 09:58:09 +0800
Tag:    v2.0.3

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

commit 34700d60f27f53db24d4fbd1cef2a2d754e19dc0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 07 Mar 2011 09:48:42 +0800
Tag:    v2.0.3

Merge branch 'MDL-20562-report-link-string' of git://github.com/mudrd8mz/moodle

commit 51ecc3255bffd3e5f96984f29234923109aafb9b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 07 Mar 2011 09:37:28 +0800
Tag:    v2.0.3

Merge branch 'm20_MDL-26672_aiccfix' of git://github.com/danmarsden/moodle

commit 500422e6d0c5a9cca11588db655e2ba44514df21
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 07 Mar 2011 08:56:28 +0800
Tag:    v2.0.3

Merge branch 'workshop-submissions-anonymity-and-availability' of git://github.com/mudrd8mz/moodle

commit 5ff33ba14bf8c5be29092274aa5ea6768dc89b6f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 07 Mar 2011 08:22:43 +0800
Tag:    v2.0.3

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

commit 34e30d9bce48a305db3906285e6dc0d214d01c63
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 07 Mar 2011 08:12:55 +0800
Tag:    v2.0.3

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

commit 7d754148c41c49635f3d755457adddb192c03baa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 07 Mar 2011 08:06:51 +0800
Tag:    v2.0.3

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

commit 2875c1507ffc33fddf16761652e79b0215a3b1d4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 07 Mar 2011 07:29:14 +0800
Tag:    v2.0.3

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

commit 5878504958368b9562be7e35628e01c8e903996f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 07 Mar 2011 07:25:54 +0800
Tag:    v2.0.3

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

commit 07a36633f9554c7b90ea6fcd6b3f8c4eca4db210
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 07 Mar 2011 07:10:16 +0800
Tag:    v2.0.3

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

commit 5eb1e14aa47ddb2e3046348c584482141afcc9fe
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Mar 2011 02:02:04 +0800
Tag:    v2.0.3

Merge branch 'w09_MDL-26564_20_uploadusers' of git://github.com/skodak/moodle

commit 8cf42d248ebacca9f29cdbdc55c781d34aedcd73
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 01 Mar 2011 19:05:52 +0800
Tag:    v2.0.3

Merge branch 'w09_MDL-26564_20_uploadusers' of git://github.com/skodak/moodle

commit 847753d4973f7363bec23ef78bf7553aa8e74a22
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 01 Mar 2011 01:41:03 +0800
Tag:    v2.0.3

Merge branch 'w09_MDL-26616_20_resourcelinks' of git://github.com/skodak/moodle

commit c2a975e68d7bf3032ef28aea40801b0233fe95a7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 28 Feb 2011 19:27:46 +0800
Tag:    v2.0.3

Merge branch 'MDL-26047' of git://github.com/ptrkmkl/moodle

commit 77e4bb774b84060b3ccbc509944d90f46265a6e7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 28 Feb 2011 17:17:51 +0800
Tag:    v2.0.3

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

commit fa188aa0a21f550e4a829379ee07452e50ed1ef1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Feb 2011 06:00:46 +0800
Tag:    v2.0.3

Merge branch 'MDL-26546-workshop-restore' of git://github.com/mudrd8mz/moodle

commit d6211dce9a4bb5aa1c8148cf19b6c949ba9fe4ba
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Feb 2011 23:51:49 +0800
Tag:    v2.0.3

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

commit ec58c9ddf01e03b1dc9f61d820324b3cdfaa10c3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Feb 2011 23:23:08 +0800
Tag:    v2.0.3

Merge branch 'MDL-26537-flickr-callback-url' of git://github.com/mudrd8mz/moodle

commit 5df4d6ccab0fe0ba327c1dd510f379ced1507752
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Feb 2011 23:12:43 +0800
Tag:    v2.0.3

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

commit 9da0fc11ac9e3e5ba7e294a6723f3e2c6028e705
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Feb 2011 22:40:30 +0800
Tag:    v2.0.3

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

commit 0783533066b72dc959b61020aa78b512477c2019
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Feb 2011 22:37:24 +0800
Tag:    v2.0.3

Merge branch 'AMOS-install-strings' of git://github.com/mudrd8mz/moodle

commit a8f690e4e68f0e83393ad0c085e97b0f53059a94
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Feb 2011 22:35:50 +0800
Tag:    v2.0.3

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

commit 908053e21de88b7f594d7de33945c243794eac77
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Feb 2011 19:41:28 +0800
Tag:    v2.0.3

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

commit 915a20f5a58d10aefb1497857a769fa5d176ec73
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Feb 2011 19:24:48 +0800
Tag:    v2.0.3

Merge branch 'MDL-26546-workshop-restore' of git://github.com/mudrd8mz/moodle

commit 0797530336368a91cc0c7af18aa66a2d94ef2939
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Feb 2011 19:18:52 +0800
Tag:    v2.0.3

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

commit c5530f415141dbf5b75facdd9da370f69be63375
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Feb 2011 18:45:57 +0800
Tag:    v2.0.3

Merge branch 'fix-symbian' of git://github.com/darenc/moodle

commit f7edca80b00159cfd2d2420930a965b57834eb37
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Feb 2011 18:35:29 +0800
Tag:    v2.0.3

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

commit 3521e87f06d8b08a4f2bd9cd40246343999ad902
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Feb 2011 18:30:33 +0800
Tag:    v2.0.3

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

commit f44872427fc6a2944b41a12bf832c9c62688f963
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Feb 2011 18:26:56 +0800
Tag:    v2.0.3

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

commit d33d813d91ade1a7bf8bbf99c8b821e8d40d5807
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Feb 2011 18:25:03 +0800
Tag:    v2.0.3

Merge branch 'lesson-rendering' of git://github.com/mudrd8mz/moodle

commit e49c60345e80e10139fe388f8c6843f47ccf1531
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Feb 2011 18:17:16 +0800
Tag:    v2.0.3

Merge branch 'wip-MDL-26507' of git://github.com/sammarshallou/moodle

commit 29336fb13ce8c300458a08ccc8f712b77ed93879
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Feb 2011 18:06:23 +0800
Tag:    v2.0.3

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

commit cc31313c4b2188ead3677f769eec231ab322237a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Feb 2011 17:27:38 +0800
Tag:    v2.0.3

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

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

commit 958c04e450295f164990b5b9eda000e4fa358e3f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Dec 2010 00:02:02 +0800
Tag:    v2.0.1

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

commit 011c956ba14ab69d20d404e13a36c5608ea7b250
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Dec 2010 19:21:21 +0800
Tag:    v2.0.1

Merge branch 'm20_MDL-14934_excel_time' of github.com:dongsheng/moodle