Git merges in Moodle 2.1.x by Petr Skoda

commit 26e3dce4666c5a415b2ab6ba9f6089068ea3145d
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 16 Aug 2011 02:41:12 +0800
Tag:    v2.1.2

Merge branch 'MDL-27845_rating_aggregation_21' into MOODLE_21_STABLE

commit 1c106106fde8fd48c5df1f09e47311331b0b0f02
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 08 Aug 2011 21:35:05 +0800
Tag:    v2.1.2

Merge branch 'MDL-28620_21' of git://github.com/jbrisland/moodle into MOODLE_21_STABLE

commit c0852d9a0c6d07a80e597284707e19410ca57345
Author: Petr Skoda <commits@skodak.org>
Date:   Thu, 04 Aug 2011 00:02:52 +0800
Tag:    v2.1.2

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 5d08b03e5b17279c39db09a008d5ad0e2c2d3423
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 02 Aug 2011 21:12:54 +0800
Tag:    v2.1.2

Merge branch 'wip-mdl-27658-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit e4e3b12325fc7b50efce83c4730ca54e91efdb4f
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 02 Aug 2011 21:08:48 +0800
Tag:    v2.1.2

Merge branch 'MDL-28338_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit fb563a9949e5e7f3d0ce9637ada6a41c716945d9
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 02 Aug 2011 20:51:30 +0800
Tag:    v2.1.2

Merge branch 'MDL-28507_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 4ac669f1e8591baf66d5cfe99dc711b834f78045
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 26 Jul 2011 17:09:49 +0800
Tag:    v2.1.1

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit a24681a87a1afc466ab7703ea0eb9b7933240650
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 26 Jul 2011 01:54:07 +0800
Tag:    v2.1.1

Merge branch 'MDL-28437_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit e1ad3c38bc9f2082bdf59d89d8a0db74bc939286
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 26 Jul 2011 01:52:26 +0800
Tag:    v2.1.1

Merge branch 'MDL-28369_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 7ff71aca595a033fbafc0810d806dfccf63199ed
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 26 Jul 2011 01:50:18 +0800
Tag:    v2.1.1

Merge branch 'MDL-28377_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit e2056863978cc8935e55d12a8bd8afd7078aab1b
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 25 Jul 2011 23:03:18 +0800
Tag:    v2.1.1

Merge branch 'wip-MDL-28421-MOODLE_21_STABLE' of https://github.com/Beedell/moodle into MOODLE_21_STABLE

commit ba295bba2920b60da1d8680552388f0b6ecaf097
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 25 Jul 2011 22:46:42 +0800
Tag:    v2.1.1

Merge branch 'wip-MDL-28191-m21' into MOODLE_21_STABLE

commit 25f9dae427d2129db38e2dec702b6ec07572ae9c
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 25 Jul 2011 22:25:40 +0800
Tag:    v2.1.1

Merge branch 'MDL-28453_MOODLE_21_STABLE' into MOODLE_21_STABLE

commit f21656d5d0f3a0dcaf89083b9d77a24887344dc5
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 19 Jul 2011 21:16:46 +0800
Tag:    v2.1.1

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 8fa38242d06d24645e38d1c000266e39f5acb18b
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 21:34:09 +0800
Tag:    v2.1.1

Merge branch 'wip-MDL-28040-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE

commit aa3097da6365e7aad797d085f08958bcb61eff70
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 21:28:54 +0800
Tag:    v2.1.1

Merge branch 'wip-MDL-28184-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE

commit 719368f8cf6626ba285db92c6f77334fc84d0cd5
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 21:25:31 +0800
Tag:    v2.1.1

Merge branch 'wip-MDL-28205-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE

commit dd70519ab4716f6785b08adf64dcf9d8676f3ebf
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 21:22:57 +0800
Tag:    v2.1.1

Merge branch 'wip-MDL-28137-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE

commit 38a10409571d2c1f68a51aedb5b05c014c953df0
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 21:20:01 +0800
Tag:    v2.1.1

Merge branch 'wip-MDL-27771-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE

commit ea3317e7823404fa87b677f09cd982e4f4d0aca7
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 21:17:55 +0800
Tag:    v2.1.1

Merge branch 'wip-MDL-27696-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE

commit f871cc1b8a8245fcdc0714bf6be4e0c4a7a3f603
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 21:14:42 +0800
Tag:    v2.1.1

Merge branch 'wip-MDL-27305-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE

commit 29d4f2eeb3bde96adbb82135eb9db62270835308
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 20:57:59 +0800
Tag:    v2.1.1

Merge branch 'wip-MDL-25870-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE

commit 4bc43436b93b5e5459d8708a565361e7c6199805
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 15:34:18 +0800
Tag:    v2.1.1

Merge branch 'wip-MDL-25125-MOODLE_21_STABLE' of github.com:marinaglancy/moodle into MOODLE_21_STABLE

commit 039d221e49e3c4cc58c8815090bf916ecb5955f8
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 25 Apr 2011 23:51:41 +0800
Tag:    v2.1.0

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

commit 6bc62c4486d67fc0bcbfcff9db80c65a1797dfc6
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 25 Apr 2011 23:50:01 +0800
Tag:    v2.1.0

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

commit af4378aee985cf8cbd2cc38d89cd768c85a9baaa
Author: Petr Skoda <commits@skodak.org>
Date:   Sun, 17 Apr 2011 23:16:03 +0800
Tag:    v2.1.0

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

commit 13516b7c1f620599e6a2a689642f66035f240ee7
Author: Petr Skoda <commits@skodak.org>
Date:   Sun, 17 Apr 2011 23:09:05 +0800
Tag:    v2.1.0

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

commit 6b7fb3366190cf305675d749192ff920351563c1
Author: Petr Skoda <commits@skodak.org>
Date:   Sun, 17 Apr 2011 23:02:15 +0800
Tag:    v2.1.0

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

commit e87ca54256e295f7c26d0e1cff215d8f43c2ce1b
Author: Petr Skoda <commits@skodak.org>
Date:   Sun, 17 Apr 2011 22:37:54 +0800
Tag:    v2.1.0

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

commit c001225250bcd2349e262e68b7a38b034edb4a44
Author: Petr Skoda <commits@skodak.org>
Date:   Sun, 17 Apr 2011 22:30:41 +0800
Tag:    v2.1.0

Merge branch 'MDL-22308_20' of git://git.catalyst.net.nz/moodle-r2

commit c6423ea2de931bc84822834d2e73e61db3035dd4
Author: Petr Skoda <commits@skodak.org>
Date:   Sun, 17 Apr 2011 22:21:51 +0800
Tag:    v2.1.0

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

commit bdc782470bb90d9dab3a2ff36474ad0ee06cce53
Author: Petr Skoda <commits@skodak.org>
Date:   Sun, 17 Apr 2011 22:11:49 +0800
Tag:    v2.1.0

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

commit 2c55034844a75384f037b84639b1b4ac5f9fd2db
Author: Petr Skoda <commits@skodak.org>
Date:   Wed, 13 Apr 2011 22:48:38 +0800
Tag:    v2.1.0

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

commit fe0ccf0c792c0d241438e19fb10d1cc747402c89
Author: Petr Skoda <commits@skodak.org>
Date:   Wed, 13 Apr 2011 21:23:33 +0800
Tag:    v2.1.0

Merge branch 'MDL-27053-dev-code-warning' of git://github.com/mudrd8mz/moodle

commit d2e360a95b9a248327841eac7cab53bdb8e4f3da
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 12 Apr 2011 15:50:20 +0800
Tag:    v2.1.0

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

commit 39de30aac22ff2322734adc9ec0399f4d1366f1c
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 11 Apr 2011 20:14:02 +0800
Tag:    v2.1.0

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

commit 337d8b14896d31b643c922ecefef6521a64256c1
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 11 Apr 2011 20:09:15 +0800
Tag:    v2.1.0

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

commit de57ec3926338fdabe5b7a54f3976ef70fbf1a83
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 11 Apr 2011 19:31:45 +0800
Tag:    v2.1.0

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

commit a32ab0254c96b018a8bd2ed7692131cbe5615617
Author: Petr Skoda <commits@skodak.org>
Date:   Wed, 06 Apr 2011 17:26:20 +0800
Tag:    v2.1.0

Merge branch 'MDL-26784-plugin-manager' of git://github.com/mudrd8mz/moodle

commit 773e3c50311e4a2d86e95e69d6061712f4d6d4a3
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 05 Apr 2011 16:19:16 +0800
Tag:    v2.1.0

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

commit 33620e1772fb9050d66a45d8dd7333098c3b22ce
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 04 Apr 2011 17:55:39 +0800
Tag:    v2.1.0

Merge branch 'MDL-26784-plugin-manager' of git://github.com/mudrd8mz/moodle

commit 3d3ead8e3591f1165375723a598098dfcc28f355
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 04 Apr 2011 17:19:51 +0800
Tag:    v2.1.0

Merge branch 'MDL-26914-lang-grand-parents' of git://github.com/mudrd8mz/moodle

commit 1f6788854065a77c753b5d0a56bb92eedb4e7dc8
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 04 Apr 2011 15:55:41 +0800
Tag:    v2.1.0

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

commit 7974c4ec037b9c411b0aa467c42349d3c26421f7
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 04 Apr 2011 15:49:12 +0800
Tag:    v2.1.0

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

commit 3b6d215b91130ae3c0c6ebb3d7041f7e5485ded1
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 29 Mar 2011 15:57:20 +0800
Tag:    v2.1.0

Merge branch 'MDL-26964-moodle_url-anchor_master' of git://github.com/mudrd8mz/moodle

commit b2b9320570d5c63da7d2f38a092149529971f63d
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 28 Mar 2011 22:49:49 +0800
Tag:    v2.1.0

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

commit ce14a7644edb071e21ea6e3ce2a81a888e211e10
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 28 Mar 2011 21:15:23 +0800
Tag:    v2.1.0

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