Git merges in Moodle 2.1.3 by Sam Hemelryk

commit 1ed6756d80ac935ce9d046551a383559be59a80f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 25 Nov 2011 07:44:39 +0800
Tag:    v2.1.3

Merge branch 'MDL-26431-21' of git://github.com/totara/moodle into MOODLE_21_STABLE

commit c3ef0a618dd97558e31e74d258a2f109f9181991
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 25 Nov 2011 06:59:18 +0800
Tag:    v2.1.3

Merge branch 'MDL-29115_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit 3174abc728a305ec5638cec116f22b98bb444ad4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 25 Nov 2011 06:36:26 +0800
Tag:    v2.1.3

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

commit f99bd07ab6a48465d899d895777ec2a62db22fe6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Nov 2011 09:20:10 +0800
Tag:    v2.1.3

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

commit aa1d8c5cdee9f3704a33cb0b63a53317504af3dd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Nov 2011 08:57:38 +0800
Tag:    v2.1.3

Merge branch 'MDL-29904-M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit 4236448a19a1837f3cc76e060ac7fcdc4a43cb8d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Nov 2011 13:28:30 +0800
Tag:    v2.1.3

Merge branch 'MDL-28629_MOODLE_21_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_21_STABLE

commit 27bc2953827ec7114a07f768448a168e7057e220
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Nov 2011 07:59:37 +0800
Tag:    v2.1.3

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

commit 02c43cd86a277471af0bdfe36d1dd5b002fcb94b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 Nov 2011 09:54:27 +0800
Tag:    v2.1.3

Merge branch 'MDL-24577-MOODLE_21_STABLE-1' of git://git.luns.net.uk/moodle into MOODLE_21_STABLE

commit 18b7d189595214b4c62a756ccfc39232a0568ecb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 Nov 2011 08:07:33 +0800
Tag:    v2.1.3

Merge branch 'MDL-29893-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit fcd27b4981a1b7b49aff086c681d1aa9919a3c9a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Nov 2011 12:50:47 +0800
Tag:    v2.1.3

Merge branch 'MDL-28670_m21' of git://github.com/nebgor/moodle into MOODLE_21_STABLE

commit 2331e2edddd442f5c86f9d198b75da603bcda331
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Nov 2011 08:09:44 +0800
Tag:    v2.1.3

Merge branch 'MDL-25823_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit c2d7c2296209f2be3ae789172a21cc633b03e01e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Nov 2011 07:05:39 +0800
Tag:    v2.1.3

Merge branch 'wip-MDL-30059-stable21' of git://github.com/phalacee/moodle into MOODLE_21_STABLE

commit 3fb3517a002185250af9b70e2e4b9954d7cfba1e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Nov 2011 07:02:59 +0800
Tag:    v2.1.3

Merge branch 'MDL-2942-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit fb09c60c5e22f9818050ee05f715c26686147c4a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Nov 2011 07:24:21 +0800
Tag:    v2.1.3

Merge branch 'wip-MDL-28292-stable21' of git://github.com/phalacee/moodle into MOODLE_21_STABLE

commit ace2712e43ae6b051a7088716231a4e4837843a3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Nov 2011 06:41:25 +0800
Tag:    v2.1.3

Merge branch 'MDL-29955_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit 2acd50840cd2c4655a12cd91bf4091a759147021
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 11:52:31 +0800
Tag:    v2.1.3

Merge branch 'w43_MDL-29980_m21_flowcss' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 9fc8435c2105df5279aaa81b441b297b56a75719
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 11:11:44 +0800
Tag:    v2.1.3

Merge branch 'MDL-29197-M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit 685cc34c186f0c93b02a0e8a4ee27f7d4e80405b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 10:58:14 +0800
Tag:    v2.1.3

Merge branch 'MDL-25760_M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit 5e56574d5576de23826ef8f94bce29dc78905d3f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 04:38:10 +0800
Tag:    v2.1.3

Merge branch 'w43_MDL-29925_m21_calendar' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 132258428763a61671c1328272755539181a4d9e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 12:31:49 +0800
Tag:    v2.1.3

Merge branch 'w43_MDL-28720_m21_calendarreturn' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 7a6d43a3eeac3e28a62e6ddfe233727afa042fae
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 12:10:41 +0800
Tag:    v2.1.3

Merge branch 'MDL-29810-21' of git://github.com/bostelm/moodle into MOODLE_21_STABLE

commit 376d035af926e6b22c5b90df4a6a4096c12bc00d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 08:05:53 +0800
Tag:    v2.1.3

Merge branch 'MDL-30006-workshop-grades_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit c440076d2b833c1fc2a412facd84b59761d8706f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 08:00:08 +0800
Tag:    v2.1.3

Merge branch 'm21_MDL-28559' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit d612fa300e720e18e60718413b616fd83a1e11d0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 07:56:18 +0800
Tag:    v2.1.3

Merge branch 'm21_MDL-29965' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit 84ac3ff12259ca1fc7e4f02af5fe38bcf9e4925b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 07:44:31 +0800
Tag:    v2.1.3

Merge branch 'MDL-29898-MOODLE_21_STABLE-1' of git://git.luns.net.uk/moodle into MOODLE_21_STABLE

commit 5c6ec457069ed8a460cad94080985d353e4c38cf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Oct 2011 05:44:20 +0800
Tag:    v2.1.3

Merge branch 'MDL-29569_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit 68bbf587456cee5b844b92c21e4f8ba615270a32
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 11:47:03 +0800
Tag:    v2.1.3

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

commit 523f4aa78747ee238bd8ac93988440200e00c9cd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 10:19:12 +0800
Tag:    v2.1.3

Merge branch 'wip-MDL-29231-stable21' of git://github.com/phalacee/moodle into MOODLE_21_STABLE

commit 35e2ec4df5b488ba3575120c2425eaef106c1d1e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 07:25:06 +0800
Tag:    v2.1.3

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

commit 3a87f672b7ae4c949ce8c682c52a89e26502057b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 06:50:10 +0800
Tag:    v2.1.3

Merge branch 'w42_MDL-29862_m21_fullmeinit' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit bc23dbcf78c1ebb11b8806741b50724a8b71b088
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Oct 2011 06:39:24 +0800
Tag:    v2.1.3

Merge branch 'MDL-29501-m21' of git://github.com/sammarshallou/moodle into MOODLE_21_STABLE

commit a258bda0b5e3f376838acd3d7a236e3a4aa04619
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 13:51:58 +0800
Tag:    v2.1.3

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

commit f1618d93436e142c53fafad749299c161bd116a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 12:37:16 +0800
Tag:    v2.1.3

Merge branch 'MDL-26953-M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit 6adc168c96133fd373ad777173743b90123bfd5f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 11:26:04 +0800
Tag:    v2.1.3

Merge branch 'MDL-28945-m21' of git://github.com/sammarshallou/moodle into MOODLE_21_STABLE

commit 24e5f9df630f90371d955c1866ecb3e7f5e99eb0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 10:17:36 +0800
Tag:    v2.1.3

Merge branch 'MDL-29781-M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit 297f40838a7ef2de1064881fa6776e4ddf8725d0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 08:55:18 +0800
Tag:    v2.1.3

Merge branch 'MDL-26893-M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit 28d838ba5eef9f32edd9a7774d9bcf9ff911e6c5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Oct 2011 05:27:04 +0800
Tag:    v2.1.3

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

commit b1913094d4d0fc253e64a0a791375e762dd239e0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 12:56:58 +0800
Tag:    v2.1.3

Merge branch 'MDL-16553-21' of git://github.com/bostelm/moodle into MOODLE_21_STABLE

commit 63a778838e0e503d1fbfff77e85b570d51d1c0a1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 11:27:04 +0800
Tag:    v2.1.3

Merge branch 'MDL-29661' of git://git.luns.net.uk/moodle into MOODLE_21_STABLE

commit 27625e0fca4723edc20ae73ea56b8cb2cfb22e70
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 09:56:59 +0800
Tag:    v2.1.3

Merge branch 'MDL-29692' of git://git.luns.net.uk/moodle into MOODLE_21_STABLE

commit 7fbb52d71712ae9b3cbe05e69391c18817ae210b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 07:09:19 +0800
Tag:    v2.1.3

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

commit 2a0df645217ebc493636f2575cf2af49b6ce8104
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 07:03:09 +0800
Tag:    v2.1.3

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

commit 430ce6cca3cd4a6355e4f96b6ab3e6fbfe88f5a1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 06:51:08 +0800
Tag:    v2.1.3

Merge branch 'mdl-29564-assignment-plagiarism' of git://github.com/sbourget/moodle into MOODLE_21_STABLE