Git merges in Moodle 2.0.2 by Petr Skoda

commit ed3eb9ea749ff7a1a7a9773b4975f05a65ed5a8a
Author: Petr Skoda <commits@skodak.org>
Date:   Sat, 19 Feb 2011 01:20:44 +0800
Tag:    v2.0.2

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

commit 3bc644ce70ec41a747b0e1024220f75c903253b7
Author: Petr Skoda <commits@skodak.org>
Date:   Thu, 17 Feb 2011 03:24:54 +0800
Tag:    v2.0.2

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

commit c9e12de4e3ca4a874309f1a6df5909ab73616069
Author: Petr Skoda <commits@skodak.org>
Date:   Wed, 16 Feb 2011 16:59:14 +0800
Tag:    v2.0.2

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

commit 64529cb6d2a8a2700613a9539bad8f1d44d9097b
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 15 Feb 2011 17:39:54 +0800
Tag:    v2.0.2

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

commit 2453531f038e19faace0de69fb6dd08f571fe812
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 15 Feb 2011 05:15:30 +0800
Tag:    v2.0.2

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

commit 3fa0670a98120df81aefa1fcb1d18e62765876d3
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 15 Feb 2011 05:10:37 +0800
Tag:    v2.0.2

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

commit 5d41c24d9fc15e577edf24d671207c2939028ffe
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 15 Feb 2011 04:45:57 +0800
Tag:    v2.0.2

Merge branch 'MDL-26312-workshop-upgrade' of git://github.com/mudrd8mz/moodle

commit 7a8fe6fa410257118a02a887daf7ab6eed833191
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 15 Feb 2011 04:42:50 +0800
Tag:    v2.0.2

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

commit 9ceaf7b5a0992eb863e15f1506e800c93476c789
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 15 Feb 2011 04:37:37 +0800
Tag:    v2.0.2

Merge branch 'm20_MDL-26212_resizefix' of git://github.com/danmarsden/moodle

commit cbbc272542ce9ea185c6e0a7cee84c4f740f6ba1
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 15 Feb 2011 04:19:35 +0800
Tag:    v2.0.2

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

commit 251e5a8b62f1bee1cb020758e46e4ff529eeda2e
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 15 Feb 2011 04:08:19 +0800
Tag:    v2.0.2

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

commit 995b6ff605eeeb5cfb0afef9ea67de7482af7634
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 15 Feb 2011 04:02:49 +0800
Tag:    v2.0.2

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

commit e027bfcfaac95fd3ba287390a5bbd111c2f9a702
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 15 Feb 2011 03:57:13 +0800
Tag:    v2.0.2

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

commit a60a943696e2b6ee8a41ea2d64d394d7e84fb6e6
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 15 Feb 2011 03:39:31 +0800
Tag:    v2.0.2

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

commit 47a13ff99ae928f9f624704625e05952ccf55c47
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 15 Feb 2011 03:37:28 +0800
Tag:    v2.0.2

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

commit d2592c9b547bfcf2e096070f9a2355c320ef6378
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 15 Feb 2011 03:34:58 +0800
Tag:    v2.0.2

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

commit a8759c65e46876ff102d1ea6d87882f709221ec2
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 14 Feb 2011 16:52:28 +0800
Tag:    v2.0.2

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

commit 419814db024fbf88f03c33ed4c75c48c3bb64781
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 14 Feb 2011 16:43:06 +0800
Tag:    v2.0.2

Merge branch 'm20_MDL-25215_filepicker_saveas' of git://github.com/dongsheng/moodle

commit cbe4cbc268677df4ee0e271d20bf2f9aea3fb63c
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 14 Feb 2011 16:20:53 +0800
Tag:    v2.0.2

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

commit 3c5b312b8df917c4a440cd4f60e36001ebbe5ed9
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 14 Feb 2011 15:57:58 +0800
Tag:    v2.0.2

Merge branch 'MDL-25991_actionnav' of github.com:skodak/moodle

commit f2f45270ee50579da7ec7d076ff7abea218101a1
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 08 Feb 2011 06:07:16 +0800
Tag:    v2.0.2

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

commit 81c29ae06dee76239ea08ea28264b08132d96bbf
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 08 Feb 2011 06:05:08 +0800
Tag:    v2.0.2

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

commit c055cebfbbd716067788f7b11ef7846df0f4e49d
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 08 Feb 2011 04:49:32 +0800
Tag:    v2.0.2

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

commit 476b123a721c2cec1b022ca23f63b239d45c473c
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 08 Feb 2011 04:37:16 +0800
Tag:    v2.0.2

Merge branch 'm20_MDL-25468_coding_error' of git://github.com/dongsheng/moodle

commit 8c4a6a4fe8c631c1d053cc02b0449e5cebc02059
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 08 Feb 2011 04:31:35 +0800
Tag:    v2.0.2

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

commit a052bf8ba0929a04318a8b0c3d7d808a5a12ea3c
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 08 Feb 2011 04:28:20 +0800
Tag:    v2.0.2

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

commit e27b5b6b29f2943497f2c0f5b7b251cba5e4176f
Author: Petr Skoda <commits@skodak.org>
Date:   Wed, 02 Feb 2011 20:49:16 +0800
Tag:    v2.0.2

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

commit 46df3c605996743dfde18d75ee2c576e5bf26be8
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 01 Feb 2011 05:44:17 +0800
Tag:    v2.0.2

Merge branch 'MDL-25981'

commit b6f3e4f8f07cfd9a2443029ff2211e7f60f11123
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 01 Feb 2011 02:25:41 +0800
Tag:    v2.0.2

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

commit 57d51199b7ff865a94e0d92edf4e0ab8ca7e77d9
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 31 Jan 2011 21:26:03 +0800
Tag:    v2.0.2

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

commit 8afc38bd39afada5b76e426ec99243291007352c
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 31 Jan 2011 21:21:53 +0800
Tag:    v2.0.2

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

commit cb3c4b448ece053e1c116a9381ec1e093eef1f3c
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 31 Jan 2011 16:38:51 +0800
Tag:    v2.0.2

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

commit bee34e2b6deb6bb85d2310d1d747fec70be25e6a
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 31 Jan 2011 16:36:15 +0800
Tag:    v2.0.2

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

commit a84299fee5ad34f14fa54240c66f44dc2c016cb8
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 31 Jan 2011 16:06:31 +0800
Tag:    v2.0.2

Merge branch 'm20_MDL-25895_repository_ajax' of git://github.com/dongsheng/moodle

commit 63786031f28323b7ac9134123d621610a6a92e8c
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 31 Jan 2011 16:04:29 +0800
Tag:    v2.0.2

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

commit 1c6a1e12aa1425dc1346dae6f3c47dd8bb6bbc38
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 31 Jan 2011 15:56:25 +0800
Tag:    v2.0.2

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

commit e565c9baf78f22766b8cf3aded3589a3da05423c
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 18 Jan 2011 04:22:43 +0800
Tag:    v2.0.2

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

commit 696a6ee12f352513f4bc7637e82de0e45f11d90d
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 18 Jan 2011 04:13:07 +0800
Tag:    v2.0.2

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

commit 1f50b85867e02880cc07e6ea87844cbee985444d
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 18 Jan 2011 03:52:31 +0800
Tag:    v2.0.2

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

commit 9c170a4323339ab49722909ea5e68f63a4e3f7a5
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 18 Jan 2011 03:49:53 +0800
Tag:    v2.0.2

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

commit 5cfe8aecb8b78e343ded38ba9e7a0a859887d21c
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 18 Jan 2011 03:45:53 +0800
Tag:    v2.0.2

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

commit 295710b06913d9109ca5f33e0d37659d50118e16
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 18 Jan 2011 03:42:17 +0800
Tag:    v2.0.2

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

commit dd265e30913955a0e93c8d256fdf39eec8b37e17
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 18 Jan 2011 03:25:56 +0800
Tag:    v2.0.2

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

commit 39e316e167162b2810a32d2dbbf22181c231e582
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 18 Jan 2011 03:22:26 +0800
Tag:    v2.0.2

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

commit c6947dd878db709db5f70d340c148106377cba86
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 18 Jan 2011 03:20:43 +0800
Tag:    v2.0.2

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

commit af929b8d0944646ee9f19a2b95b47dcff4bf34ed
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 18 Jan 2011 02:12:33 +0800
Tag:    v2.0.2

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

commit bb871bc4ca5a9fa92445e40fcb8de6f3a3d0d78a
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 18 Jan 2011 02:02:55 +0800
Tag:    v2.0.2

Merge branch 'workshop_random_allocator' of git://github.com/mudrd8mz/moodle

commit a477c0da6e1e52083ad48cc137e0685bbf754754
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 18 Jan 2011 02:01:02 +0800
Tag:    v2.0.2

Merge branch 'MDL-25980-mnet_remote_enrolment' of git://github.com/mudrd8mz/moodle

commit 3827ee9415b7623670adf42ce371c4aff7b722b6
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 18 Jan 2011 01:57:22 +0800
Tag:    v2.0.2

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

commit f4f374176d75c24eef65923d97ae7c4310869e0e
Author: Petr Skoda <commits@skodak.org>
Date:   Wed, 12 Jan 2011 16:57:18 +0800
Tag:    v2.0.2

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

commit 65beff8ea49a6d201cede284ceee6a5919594751
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 11 Jan 2011 23:21:58 +0800
Tag:    v2.0.2

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

commit 4bbcdcec0d831e2d81c7b61123d6419105172278
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 10 Jan 2011 22:16:22 +0800
Tag:    v2.0.2

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

commit 9c157556338bca510aadf66ca98b71f983212ed4
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 10 Jan 2011 21:54:53 +0800
Tag:    v2.0.2

Merge branch 'm20_MDL-25501_wiki_upgrade_improvement' of git://github.com/dongsheng/moodle

commit 4761e6334fdebd4c2518e014c88efaba73d637df
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 10 Jan 2011 21:51:22 +0800
Tag:    v2.0.2

Merge branch 'm20_MDL-25669_course_sortorder' of git://github.com/dongsheng/moodle

commit d0dbd5a34588ebb9847ad005ca1e49fc4a18b9b7
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 10 Jan 2011 21:44:26 +0800
Tag:    v2.0.2

Merge branch 'm20_MDL-25219_question_text' of git://github.com/dongsheng/moodle

commit 6fa8c7ea86d988a1e40b3b468ea121799aa6fd28
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 10 Jan 2011 21:41:04 +0800
Tag:    v2.0.2

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

commit 0e3fdf10c29ddff1bee22dae019a0a46c56006ea
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 10 Jan 2011 21:38:16 +0800
Tag:    v2.0.2

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

commit 5301285d8780a1daa56d2bb3b417a3a953cbb4e4
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 10 Jan 2011 21:37:21 +0800
Tag:    v2.0.2

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

commit 2f1b1abc836cc9e6b7dbb6746d0e252bb1269c68
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 10 Jan 2011 21:35:38 +0800
Tag:    v2.0.2

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

commit e168f8cca65b9f7152e6f54b45ff14e4011ae12c
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 10 Jan 2011 21:34:18 +0800
Tag:    v2.0.2

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

commit 29612524f378845c3573beafad26760419bfb305
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 10 Jan 2011 21:31:21 +0800
Tag:    v2.0.2

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

commit d32c077bf6c373abd1c9dc7b9539359c25123e81
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 10 Jan 2011 21:21:15 +0800
Tag:    v2.0.2

Merge commit 'ed5c4cf44d0b38e129ad57747dfaf16d9677d465'

commit b2d6484598e2e9a023457c0658ddce3d2203016e
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 10 Jan 2011 21:12:34 +0800
Tag:    v2.0.2

Merge commit '246cc0e6b52f455dcb1ab23039202d7498d91d30'

commit b2f806cd9293fa0d3cae35adf7b08358dc93a97a
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 10 Jan 2011 20:43:00 +0800
Tag:    v2.0.2

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

commit b095f1694790b3f8079454878f8e28c0614ec031
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 04 Jan 2011 01:16:04 +0800
Tag:    v2.0.2

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

commit e1ce9a66703dabf92f9609eb6d1217cd125922a6
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 04 Jan 2011 01:02:44 +0800
Tag:    v2.0.2

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

commit 6a81ececb340e235cf766a4e58893f765e3e92fa
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 04 Jan 2011 00:59:53 +0800
Tag:    v2.0.2

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

commit 01f6035ea120f9343ca6b0322539a0893d6ed11b
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 04 Jan 2011 00:53:51 +0800
Tag:    v2.0.2

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

commit bf97304ac30575638aca608cf763fdb5a3848b63
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 27 Dec 2010 20:51:25 +0800
Tag:    v2.0.2

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

commit c03b6176a62c74c46dadc788daa832261c0a02dc
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 27 Dec 2010 20:44:54 +0800
Tag:    v2.0.2

Merge branch 'm20_MDL-22449_wiki_help_buttons' of git://github.com/dongsheng/moodle

commit 1310964bb33daac4fdc0984f77a71ce292162f54
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 27 Dec 2010 20:39:20 +0800
Tag:    v2.0.2

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

commit 8729e5999f8309a42785db6a1dcd8dbc758a5fb0
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 27 Dec 2010 19:46:01 +0800
Tag:    v2.0.2

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

commit 82517e2b7897df9756e07caadaa43b7f56f66f9e
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 27 Dec 2010 19:41:29 +0800
Tag:    v2.0.2

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

commit e2bbe5ff7da77cd6b837ca834cb01ddacc567618
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 27 Dec 2010 19:37:37 +0800
Tag:    v2.0.2

Merge branch 'MDL-25682' of git://github.com/danpoltawski/moodle

commit c72077c4ed9209541cd2ead5f5b1a875f713e360
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 27 Dec 2010 19:31:19 +0800
Tag:    v2.0.2

Merge branch 'MDL-25676' of git://github.com/danpoltawski/moodle

commit 1af9fd38790bb4680343f1062fd95cbee34838eb
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 27 Dec 2010 19:29:15 +0800
Tag:    v2.0.2

Merge branch 'MDL-25761_data_portfolio' of git://github.com/mudrd8mz/moodle

commit 9bb5a6f037b48dbf8c8816addba6b5764d98b34c
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 27 Dec 2010 19:25:06 +0800
Tag:    v2.0.2

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

commit 3b8929e84b345a69425af8b25050f08f1163b98a
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 27 Dec 2010 19:05:22 +0800
Tag:    v2.0.2

Merge branch 'MDL-25713_m2_recordset'