Git merges in Moodle 2.2.0 by Petr Skoda

commit 89631804a4c0892de5c4f58cf3e7147afae73210
Author: Petr Skoda <commits@skodak.org>
Date:   Thu, 25 Aug 2011 17:40:07 +0800
Tag:    v2.2.0-beta

Merge branch 'w33_MDL-28554_m22_yui' of github.com:skodak/moodle

commit 733927389589afc78a4ae30bec80e0cb5be0c116
Author: Petr Skoda <commits@skodak.org>
Date:   Wed, 24 Aug 2011 21:01:50 +0800
Tag:    v2.2.0-beta

Merge branch 'w33_MDL-28554_m22_yui' of github.com:skodak/moodle

commit ace24aaa7d9df69c6e4cc44b4ceee20d506df7cf
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 16 Aug 2011 02:45:43 +0800
Tag:    v2.2.0-beta

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

commit 49989aa47dd25c1fab245a01d632b5c0b9a1685c
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 16 Aug 2011 02:33:33 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-27845_rating_aggregation'

commit ca39e6d2fddd22bbe8f8ad977acc4448e2f71613
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 08 Aug 2011 22:18:08 +0800
Tag:    v2.2.0-beta

Merge branch 'master_MDL-28601'

commit 260cf4c2fdc6032ff9aefccea603afa7d8bd3b12
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 08 Aug 2011 21:32:29 +0800
Tag:    v2.2.0-beta

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

commit 92f97e82532a5a5ab274b269fc3d41a79d4a04f2
Author: Petr Skoda <commits@skodak.org>
Date:   Wed, 03 Aug 2011 14:27:52 +0800
Tag:    v2.2.0-beta

Merge branch 'master_MDL-28493'

commit affce0d7446836d490b6d36a2dfba39e02533b8c
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 02 Aug 2011 22:35:09 +0800
Tag:    v2.2.0-beta

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

commit 1f5be6fbcd8d7fe0ded11d177f394d53ace26061
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 02 Aug 2011 21:59:42 +0800
Tag:    v2.2.0-beta

Merge branch 'master_MDL-10707'

commit 6179c38af54d1d84d6fb11ec27a6f4aadc665b0a
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 02 Aug 2011 21:48:20 +0800
Tag:    v2.2.0-beta

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

commit 4a47631fb4806d912b8d4ce978528bb87615a296
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 02 Aug 2011 21:11:42 +0800
Tag:    v2.2.0-beta

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

commit 58f90069702ffec6c76858a3d9f409f400265a30
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 02 Aug 2011 21:08:05 +0800
Tag:    v2.2.0-beta

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

commit 411b2e1d8d0d1131da2971e306e9a66465b176ca
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 02 Aug 2011 21:01:15 +0800
Tag:    v2.2.0-beta

Merge branch 'master_MDL-28410'

commit 74b0ad6a4d4af80dd8398355f89515194363547a
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 02 Aug 2011 20:55:18 +0800
Tag:    v2.2.0-beta

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

commit 48fa0c75b54dedc9bf5760c49e9037ee289e99bb
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 02 Aug 2011 20:50:41 +0800
Tag:    v2.2.0-beta

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

commit 82b8e88418dfc112f4f89c22ec6559b015ea4a4f
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 02 Aug 2011 20:35:21 +0800
Tag:    v2.2.0-beta

Merge branch 'master_MDL-28535'

commit c03b42f521f9e6b98cb6d886ef9ad220ba5319cc
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 02 Aug 2011 20:30:20 +0800
Tag:    v2.2.0-beta

Merge branch 'master_MDL-28542'

commit 5ed2d500b173287455acaccb6c8760bff29dd7b2
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 26 Jul 2011 17:12:47 +0800
Tag:    v2.2.0-beta

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

commit 3e6f62e3d77eea6a5ac80cc50a2c388915fbb2b9
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 26 Jul 2011 01:53:37 +0800
Tag:    v2.2.0-beta

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

commit 14c94235d891df0a74b0fa9ff43d59a86dcf0710
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 26 Jul 2011 01:51:48 +0800
Tag:    v2.2.0-beta

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

commit d98b0fe9d254bf27c990a32a71f17076d4cbce29
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 26 Jul 2011 01:48:55 +0800
Tag:    v2.2.0-beta

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

commit e58d77a25985230de54009123c5dc211c4628ffd
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 25 Jul 2011 22:51:04 +0800
Tag:    v2.2.0-beta

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

commit d39afd96ffc439a5920efce41954bfbd40ec22e6
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 25 Jul 2011 22:45:40 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-28191-master'

commit 95a1cb245cd1c63a9fe50c20d4e80fc58d9e8900
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 25 Jul 2011 22:23:01 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28453'

commit 8057e4d85e7095e06eead68983f74d08214988eb
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 19 Jul 2011 21:15:32 +0800
Tag:    v2.2.0-beta

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

commit d6a1c91bee79faf9f056a0ff5061bbd1f8200fb4
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 21:58:59 +0800
Tag:    v2.2.0-beta

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

commit 696ddfe6712f9dbd6c8fb10e3e8036380b49c664
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 21:33:42 +0800
Tag:    v2.2.0-beta

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

commit fa9264b55bba35430ab4808bb2b6e73b67cefc90
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 21:28:16 +0800
Tag:    v2.2.0-beta

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

commit 215f2c36d5d38bb7e009ec9e73c07db1d4a7f72c
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 21:25:02 +0800
Tag:    v2.2.0-beta

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

commit 6857b0db47c72cdb4838a0992395c3d2f2e58399
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 21:22:29 +0800
Tag:    v2.2.0-beta

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

commit c051470207791f0fb616d1d151d4611c070ed662
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 21:19:35 +0800
Tag:    v2.2.0-beta

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

commit a1d27703feeb46c662e5f94f22f7a1cac0f72809
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 21:17:05 +0800
Tag:    v2.2.0-beta

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

commit 7856cd8b8c023185f3e97300e3ac40abb8887a28
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 21:13:44 +0800
Tag:    v2.2.0-beta

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

commit b0d6fa17a4401cf027be4333c0d3a2404c283aa8
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 20:57:02 +0800
Tag:    v2.2.0-beta

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

commit 83162b26121fc00e7c65860d8d6d0b99e1d77ef8
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 15:18:31 +0800
Tag:    v2.2.0-beta

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