Git merges in Moodle x.x.x by Petr Škoda

commit 0b196a09a8dc990ee352221942ad998750ed81e4
Author: Petr Škoda <commits@skodak.org>
Date:   Sat, 12 Jan 2013 22:49:36 +0800
Tag:    v2.5.0-beta

Merge branch 'refs/heads/w02_MDL-37286_m25_tracebuffer' into w02_MDL-37187_m25_flatfile

commit 31a22c216cac572ee19aaeacf90b5ed8cfc58ed4
Author: Petr Škoda <commits@skodak.org>
Date:   Sat, 12 Jan 2013 22:49:30 +0800
Tag:    v2.5.0-beta

Merge branch 'refs/heads/w02_MDL-37184_m25_editenrol' into w02_MDL-37187_m25_flatfile

commit d34770032c72015322b0e80285823ec4ed711e81
Author: Petr Škoda <commits@skodak.org>
Date:   Sun, 30 Sep 2012 20:35:57 +0800
Tag:    v2.4.0-beta

Merge branch 'master_MDL-35562' of git://github.com/danmarsden/moodle into w40_MDL-35701_m24_enroldb

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 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 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 7431abde3caa66a30639e148af720971ac5fa5cb
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 16 Aug 2011 02:26:19 +0800
Tag:    v2.0.5

Merge branch 'MDL-28465_rating_aggregation_split' into MOODLE_20_STABLE

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 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 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 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 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 b8a5c64e95ba8096bb0c063f34afde51ab21ed09
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 02 Aug 2011 21:14:00 +0800
Tag:    v2.0.5

Merge branch 'wip-mdl-27658-m20' of git://github.com/rajeshtaneja/moodle into MOODLE_20_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 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 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 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 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 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 b3b781f9fcaa2daa3d317e2e119d651c30dc5e92
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 01 Aug 2011 19:16:00 +0800
Tag:    v1.9.14

Merge branch 'MDL-28199_m19' of git://github.com/rwijaya/moodle into MOODLE_19_STABLE

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 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 aa79f99d5315fcb6d2de7f79b0c45c7d9aa2f408
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 26 Jul 2011 17:07:40 +0800
Tag:    v2.0.4

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

commit 2a41529f682dfbd0a6b17b1d029d86c44d6b5083
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 26 Jul 2011 01:55:46 +0800
Tag:    v2.0.4

Merge branch 'MDL-28437_20' of git://github.com/timhunt/moodle into MOODLE_20_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 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 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 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 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 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 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 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 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 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 fdee5d95b732f625666eb6d3334afe4fb54ed936
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 25 Jul 2011 22:40:56 +0800
Tag:    v1.9.13

Merge branch 'MDL-27717_MOODLE_19_STABLE' into MOODLE_19_STABLE

commit e9adc8f6eba536e8dd0ffa0d618268220eaa68d4
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 25 Jul 2011 22:30:52 +0800
Tag:    v2.0.4

Merge branch 'MDL-28453_MOODLE_20_STABLE' into MOODLE_20_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 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 e9889abe3889cc17e10db6c3624446a10047fa0e
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 19 Jul 2011 21:18:09 +0800
Tag:    v2.0.4

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_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 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 d96d9644257f4da6ebd1dbe10f3b629d058b5a28
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 21:34:42 +0800
Tag:    v2.0.4

Merge branch 'wip-MDL-28040-m20' of git://github.com/samhemelryk/moodle into MOODLE_20_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 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 4f76e7ddf714f6ae5729a6e21c94a6ebe478821f
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 21:29:19 +0800
Tag:    v2.0.4

Merge branch 'wip-MDL-28184-m20' of git://github.com/samhemelryk/moodle into MOODLE_20_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 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 393d636e259f92040d8d8f3102534aa0da69e545
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 21:25:56 +0800
Tag:    v2.0.4

Merge branch 'wip-MDL-28205-m20' of git://github.com/samhemelryk/moodle into MOODLE_20_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 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 2b98c3d5e085d0a339835d81612a8749e4133e84
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 21:23:21 +0800
Tag:    v2.0.4

Merge branch 'wip-MDL-28137-m20' of git://github.com/samhemelryk/moodle into MOODLE_20_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 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 2bd3fc4d0378e56c2722da060cd636bbf6e602ce
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 21:20:26 +0800
Tag:    v2.0.4

Merge branch 'wip-MDL-27771-m20' of git://github.com/samhemelryk/moodle into MOODLE_20_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 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 6b43f50c41cb5ffa67f3249e9bb36c35275b2cef
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 21:18:24 +0800
Tag:    v2.0.4

Merge branch 'wip-MDL-27696-m20' of git://github.com/samhemelryk/moodle into MOODLE_20_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 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 533a766447645844391772c0a1be6fa5507023ec
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 21:15:18 +0800
Tag:    v2.0.4

Merge branch 'wip-MDL-27305-m20' of git://github.com/samhemelryk/moodle into MOODLE_20_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 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 59f3144e0abd2f0baddb4bd8f3f1c9c7fc0a19d3
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 20:58:38 +0800
Tag:    v2.0.4

Merge branch 'wip-MDL-25870-m20' of git://github.com/samhemelryk/moodle into MOODLE_20_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 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 50296e134b96e28134a251313b33ff61c960e7a9
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 15:36:20 +0800
Tag:    v2.0.4

Merge branch 'wip-MDL-25125-MOODLE_20_STABLE' of github.com:marinaglancy/moodle into MOODLE_20_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 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

commit 311d8d727720285bdfca359320be35aa19c2dfa2
Author: Petr Škoda <info@skodak.org>
Date:   Tue, 21 Jun 2011 15:42:13 +0800
Tag:    v2.3.0-beta

Merge pull request #3 from mylescarrick/4b76ec61c07401bfa784cf1e62c622cad6cb1ce6

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 b79ac7e0d6964d52a6f5b3b06e287569c3973c81
Author: Petr Skoda <commits@skodak.org>
Date:   Sun, 17 Apr 2011 23:16:48 +0800
Tag:    v2.0.3

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

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 241ceba38ce66334e4e257d34f855eb6c78215fe
Author: Petr Skoda <commits@skodak.org>
Date:   Sun, 17 Apr 2011 23:09:59 +0800
Tag:    v2.0.3

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

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 8e49e0833cd74fb6358699cfbc64fbe28a9e61f7
Author: Petr Skoda <commits@skodak.org>
Date:   Sun, 17 Apr 2011 23:04:09 +0800
Tag:    v2.0.3

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

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 f6bf9c932d26b509e36a3fee5e03976632a1e581
Author: Petr Skoda <commits@skodak.org>
Date:   Sun, 17 Apr 2011 22:40:10 +0800
Tag:    v2.0.3

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

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 1fb2369b094c735958b57495126c2a530377f9c2
Author: Petr Skoda <commits@skodak.org>
Date:   Sun, 17 Apr 2011 22:22:34 +0800
Tag:    v2.0.3

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

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 4de09258205a027b7af1bae23c6d743f9c10e214
Author: Petr Skoda <commits@skodak.org>
Date:   Sun, 17 Apr 2011 22:13:08 +0800
Tag:    v2.0.3

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

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 85a91fb98e8e36bda09b38c4ba9df679890b5abd
Author: Petr Skoda <commits@skodak.org>
Date:   Wed, 13 Apr 2011 22:49:29 +0800
Tag:    v2.0.3

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

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 6de6a45a1002084d1aee3281705c2eed8f4bc52d
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 12 Apr 2011 15:55:28 +0800
Tag:    v2.0.3

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

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 16d610019a8bd92c47fd7cb5477a5bc9e0027772
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 11 Apr 2011 20:13:34 +0800
Tag:    v2.0.3

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

commit 4f5791da643e9be8573c9ad9dfa34131d03bdc6f
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 11 Apr 2011 20:10:38 +0800
Tag:    v2.0.3

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

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 13ad1eaf37d2eb5cd43c5eebc81d4f68d50e3c98
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 11 Apr 2011 19:30:44 +0800
Tag:    v2.0.3

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

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 42a50a0a454f7d8b02faa502b68321e3f3ccb8c5
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 05 Apr 2011 16:21:21 +0800
Tag:    v2.0.3

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

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 27614a5e5d949f4433c7976f7446a755fd4d5a7b
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 04 Apr 2011 15:59:04 +0800
Tag:    v2.0.3

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

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 4cb05cea9d506cda17660ae4a8dc48aa8acac63d
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 29 Mar 2011 16:00:04 +0800
Tag:    v2.0.3

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

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

commit 5c686792c63b1d8c2de1c999fd13e1e41ed513e2
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 28 Mar 2011 21:13:47 +0800
Tag:    v2.0.3

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

commit c20d07074ced7339708c91ab87f4430c776c7612
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 22 Mar 2011 02:16:37 +0800
Tag:    v2.0.3

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

commit 3bfb75a9eda182274c52c055d5200081c7d9b5c3
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 22 Mar 2011 02:10:15 +0800
Tag:    v2.0.3

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

commit 7b2dde5a802c3a50e03a6f2bd4af6c6167c8cdfb
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 22 Mar 2011 02:06:28 +0800
Tag:    v2.0.3

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

commit 94ff0f08f397899ba5417e5218104ae5d720e67f
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 22 Mar 2011 02:02:16 +0800
Tag:    v2.0.3

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

commit 25bd4d9a375b83655b2d8c82f5f3d6780c321042
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 22 Mar 2011 01:10:35 +0800
Tag:    v2.0.3

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

commit 2c23734a7ff62d8ee3e886699124e5f6b6c0d064
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 22 Mar 2011 01:02:46 +0800
Tag:    v2.0.3

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

commit 61baea5d22e42ef8518fd38e9eb6c02d6ed0a38f
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 22 Mar 2011 01:00:07 +0800
Tag:    v2.0.3

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

commit 10464ffb3339dec23c10d711944d8ca74f1e68eb
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 21 Mar 2011 22:39:31 +0800
Tag:    v2.0.3

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

commit dca072aedc73638ee436933262e7d0ee1f27119a
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 21 Mar 2011 21:52:11 +0800
Tag:    v2.0.3

Merge branch 'MDL-26571_lesson_scale' of git://github.com/andyjdavis/moodle

commit e5be555c27196f3c89325c3215ad40d09d2dbef9
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 21 Mar 2011 21:49:18 +0800
Tag:    v2.0.3

Merge branch 'MDL-26768_0_grade' of git://github.com/andyjdavis/moodle

commit 949fe7154ca8ac0dabfe1e7557547a987d8febde
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 21 Mar 2011 21:46:59 +0800
Tag:    v2.0.3

Merge branch 's8_MDL-26919_search_dialog_event' of git://github.com/dongsheng/moodle

commit d96b0a969b0ce3b1d0476ad392395137621ce94d
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 21 Mar 2011 21:03:33 +0800
Tag:    v2.0.3

Merge branch 'wip-MDL-26822'

commit b0b4ab1aff3224c27d9b23438b45b9821beff98a
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 15 Mar 2011 03:55:04 +0800
Tag:    v2.0.3

Merge branch 'MDL-26464_m20_v2' of github.com:skodak/moodle

commit cd3d2823af205acf1ad6d49161f5679e6db3af23
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 15 Mar 2011 01:21:33 +0800
Tag:    v2.0.3

Merge branch 'MDL-26228_grade_full_view2' of git://github.com/andyjdavis/moodle

commit 65361ab836b0fa62e9b3e9b5f62f2559157cce3a
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 15 Mar 2011 01:18:24 +0800
Tag:    v2.0.3

Merge branch 'MDL-24724_course_profile' of git://github.com/andyjdavis/moodle

commit 3908f7ca1af839b56391a353b5e6e28958645645
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 15 Mar 2011 01:01:19 +0800
Tag:    v2.0.3

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

commit 5dce59a4cf2662feeb07ffc091889094a573305c
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 15 Mar 2011 00:58:46 +0800
Tag:    v1.9.12

Merge branch 'MDL-4633-m19' of git://github.com/rwijaya/moodle into MOODLE_19_STABLE

commit 4eca364392d60850911add29a575d4bdada13a7f
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 07 Mar 2011 19:52:51 +0800
Tag:    v2.0.3

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

commit 8eade3d773c58dc62f7a549709be56ffd006c06f
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 07 Mar 2011 19:40:04 +0800
Tag:    v2.0.3

Merge branch 'MDL-26392_wiki_images' of git://github.com/dongsheng/moodle

commit 25ca24d59fb4a554b5299dc4e8939d277ddf4668
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 07 Mar 2011 19:32:46 +0800
Tag:    v2.0.3

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

commit 2c10c5f4e53e8c3fc1ebf0d1cfcef0d0bd2de5f9
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 07 Mar 2011 19:28:27 +0800
Tag:    v2.0.3

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

commit 29c852088acb978d0a5e9c7f79762174932ff75d
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 07 Mar 2011 17:25:28 +0800
Tag:    v2.0.3

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

commit 7a2f4c12b62e7809fa9a43bf87c2a008b628cd8d
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 07 Mar 2011 17:18:31 +0800
Tag:    v2.0.3

Merge branch 'MDL-26433_message_constants' of git://github.com/andyjdavis/moodle

commit 70e6628ea3ca68881e6674b0b8623e335bb95db0
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 28 Feb 2011 17:06:03 +0800
Tag:    v2.0.3

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

commit 589028b2037719f12fd544dcc5f75a063d352b6d
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 28 Feb 2011 17:03:57 +0800
Tag:    v2.0.3

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

commit bca4fa81a86084f2522bc5f6e95ba3c24fdf04f6
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 28 Feb 2011 17:01:03 +0800
Tag:    v2.0.3

Merge branch 'MDL-26451_alfresco_repo' of git://github.com/dongsheng/moodle

commit ed9fd13fd626df87bacee6decdf5eca98bc6001a
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 28 Feb 2011 16:59:13 +0800
Tag:    v2.0.3

Merge branch 'MDL-26228_grade_full_view' of git://github.com/andyjdavis/moodle

commit 7c4c754a89d09908b51fb0e461fd4286c5d053cc
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 28 Feb 2011 16:56:36 +0800
Tag:    v2.0.3

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

commit 16fd74a3a5e44806e9c21572d4551e8f13218d65
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 28 Feb 2011 16:48:38 +0800
Tag:    v2.0.3

Merge branch 'm20_MDL-26545_userpicfix' of git://github.com/danmarsden/moodle

commit b408c5f48505f0bb1df9a326493ac8752492ef4e
Author: Petr Skoda <commits@skodak.org>
Date:   Sat, 19 Feb 2011 02:31:20 +0800
Tag:    v1.9.11

Merge branch 'MDL-21811' of git://github.com/timhunt/moodle into MOODLE_19_STABLE

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 0c9bd492a09c0230aa89a05ecb95c5ef76976d0e
Author: Petr Skoda <commits@skodak.org>
Date:   Sat, 19 Feb 2011 01:00:19 +0800
Tag:    v1.9.11

Merge branch 'MDL-21811' of git://github.com/timhunt/moodle into MOODLE_19_STABLE

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 af497cf64cf4cbcae25cb443466f354fcb1ef05a
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 15 Feb 2011 04:40:23 +0800
Tag:    v1.9.11

Merge branch 'm19_MDL-26216_windowoptions' of github.com:danmarsden/moodle into MOODLE_19_STABLE

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 05d38f44cc618480368c1f99c19d972a15abe11c
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 15 Feb 2011 04:23:15 +0800
Tag:    v1.9.11

Merge branch 'MDL-26371_distinct_text_m19' of git://github.com/stronk7/moodle into MOODLE_19_STABLE

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 bffe6c274e50809434c9aaba14f584e28c1d6adb
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 10 Jan 2011 21:28:55 +0800
Tag:    v1.9.11

Merge branch 'MDL-20607' of git://github.com/arborrow/moodle into MOODLE_19_STABLE

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 d1dd5f0a08834127b3ab774e2e7a26c1d1ae386d
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 27 Dec 2010 19:18:53 +0800
Tag:    v1.9.11

Merge branch 'MDL-25186_m19' into MOODLE_19_STABLE

commit 76035b13394c2ce58fd24f7aae0a0e848311cb42
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 27 Dec 2010 19:09:58 +0800
Tag:    v1.9.11

Merge branch 'MDL-25713_recordset' of git://github.com/andyjdavis/moodle into MOODLE_19_STABLE

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'

commit 535037f5214d095f2bf980c9c9fb86ce89313e7b
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 27 Dec 2010 18:50:17 +0800
Tag:    v1.9.11

Merge branch 'm19-MDL-16858-fixed' of git://github.com/mouneyrac/moodle into MOODLE_19_STABLE

commit 53c8f1056f37530b80d00b1e0b1d6d33f57e027e
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 27 Dec 2010 18:33:00 +0800
Tag:    v1.9.11

Merge branch 'MOODLE_19_STABLE' of github.com:danmarsden/moodle into MOODLE_19_STABLE

commit ab127933556717a322061d05e878ff126633bbf8
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 21 Dec 2010 05:59:20 +0800
Tag:    v2.0.1

Merge branch 'xhprof' of git://github.com/stronk7/moodle

commit ab6e79718c20ece6c3ef13bb820db66899976328
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 21 Dec 2010 02:21:20 +0800
Tag:    v2.0.1

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

commit dc92d40c4435bf593b2cabfc23825101c785ce4e
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 21 Dec 2010 02:09:04 +0800
Tag:    v1.9.11

Merge branch 'mssql_database_activity' of git://github.com/stronk7/moodle into MOODLE_19_STABLE

commit 0aff11c5aedf0b26014d89289686ab5f5c946335
Author: Petr Skoda <info@skodak.org>
Date:   Sun, 01 Aug 2010 21:10:36 +0800
Tag:    v2.3.0-beta

cvsimport