Git merges in Moodle 2.1.1 by Petr Skoda

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