Git merges in Moodle 2.4.x by Paul Charsley

commit b224ff57cc4a8411df3636fa082cc5680c1de084
Author: Paul Charsley <p.charsley@massey.ac.nz>
Date:   Fri, 07 Sep 2012 14:08:02 +0800
Tag:    v2.4.0-beta

Merge branch 'master' of https://github.com/moodle/moodle

commit 5e21657f87ec6cd6ca5281205bc3b776a2ec8e0d
Author: Paul Charsley <p.charsley@massey.ac.nz>
Date:   Tue, 04 Sep 2012 04:58:31 +0800
Tag:    v2.4.0-beta

Merge branch 'master' of https://github.com/moodle/moodle

commit 4873a890df33c8d529e47bcde170ffb281ae0cf4
Author: Paul Charsley <p.charsley@massey.ac.nz>
Date:   Tue, 28 Aug 2012 06:24:05 +0800
Tag:    v2.4.0-beta

Merge branch 'master' of https://github.com/moodle/moodle

commit 4a527126273f75e1df7ae5a0c1ebf14469d6c9e5
Author: Paul Charsley <p.charsley@massey.ac.nz>
Date:   Tue, 21 Aug 2012 10:39:26 +0800
Tag:    v2.4.0-beta

Merge branch 'master' of https://github.com/moodle/moodle

commit 3a2b8bb09d6034db94060229898f895e970a1ad8
Author: Paul Charsley <p.charsley@massey.ac.nz>
Date:   Tue, 14 Aug 2012 10:00:51 +0800
Tag:    v2.4.0-beta

Merge branch 'master' of https://github.com/moodle/moodle

commit 81a0be70c8a165e2751d99f2acdcd82962dc75b6
Author: Paul Charsley <p.charsley@massey.ac.nz>
Date:   Mon, 06 Aug 2012 10:41:51 +0800
Tag:    v2.4.0-beta

Merge branch 'master' of github.com:Lightwork-Marking/moodle

commit 665b138ee1fd69b376a0f6bbe1c0d8d2986f0657
Author: Paul Charsley <p.charsley@massey.ac.nz>
Date:   Mon, 06 Aug 2012 10:38:57 +0800
Tag:    v2.4.0-beta

Merge branch 'master' of https://github.com/moodle/moodle

commit 4c5f52af42045c9d461cbef737a94e6a61ca95d5
Author: Paul Charsley <p.charsley@massey.ac.nz>
Date:   Fri, 03 Aug 2012 10:14:04 +0800
Tag:    v2.4.0-beta

Merge branch 'master' of git://git.moodle.org/moodle

commit 2ecdfa526a1b80b66ee46fcdb77b92828a0528b9
Author: Paul Charsley <p.charsley@massey.ac.nz>
Date:   Fri, 27 Jul 2012 09:55:05 +0800
Tag:    v2.4.0-beta

Merge branch 'master' of https://github.com/moodle/moodle

commit b0b6ead6b9648b2c4d59dc548052ecaf7e3ffc3e
Author: Paul Charsley <p.charsley@massey.ac.nz>
Date:   Fri, 20 Jul 2012 13:09:10 +0800
Tag:    v2.4.0-beta

Merge branch 'master' of https://github.com/moodle/moodle

commit 3e01e06defdc72b2d0e0c0067dda8d9878dce988
Author: Paul Charsley <p.charsley@massey.ac.nz>
Date:   Thu, 19 Jul 2012 05:27:26 +0800
Tag:    v2.4.0-beta

Merge branch 'master' of https://github.com/moodle/moodle

commit 716d4226fe4d1dc9a05f574df4052acf7765510b
Author: Paul Charsley <p.charsley@massey.ac.nz>
Date:   Tue, 17 Apr 2012 09:47:56 +0800
Tag:    v2.4.0-beta

Merge branch 'master' of github.com:Lightwork-Marking/moodle

commit 6f5a2eff480be4f097c84c6695a095f58fbd5c27
Author: Paul Charsley <p.charsley@massey.ac.nz>
Date:   Tue, 17 Apr 2012 09:47:02 +0800
Tag:    v2.4.0-beta

Merge branch 'master' of https://github.com/moodle/moodle

commit 5c631d86c2cfff2e2c39b86a95807eb5f9bf48cc
Author: Paul Charsley <p.charsley@massey.ac.nz>
Date:   Wed, 11 Apr 2012 08:34:06 +0800
Tag:    v2.4.0-beta

Merge branch 'master' of github.com:Lightwork-Marking/moodle

commit b6b2fb543546febfd23af9fe54aedafabf00ea83
Author: Paul Charsley <p.charsley@massey.ac.nz>
Date:   Wed, 11 Apr 2012 08:31:05 +0800
Tag:    v2.4.0-beta

Merge branch 'master' of https://github.com/moodle/moodle

commit 7cc5b68bab50c1f5e57f9e5a36e63d382c9fd171
Author: Paul Charsley <p.charsley@massey.ac.nz>
Date:   Fri, 16 Mar 2012 04:26:50 +0800
Tag:    v2.4.0-beta

Merge branch 'master' of github.com:Lightwork-Marking/moodle

commit bcd284cc1784fd0dffe8c7cc9b0df339ed8e6400
Author: Paul Charsley <p.charsley@massey.ac.nz>
Date:   Fri, 16 Mar 2012 04:24:52 +0800
Tag:    v2.4.0-beta

Merge branch 'master' of https://github.com/moodle/moodle

commit 0f9b0bcf8bf9a43f6e82f6b19b11235b311aa2e8
Author: Paul Charsley <p.charsley@massey.ac.nz>
Date:   Sat, 10 Mar 2012 12:14:37 +0800
Tag:    v2.4.0-beta

Merge branch 'master' of github.com:Lightwork-Marking/moodle

commit c218d6a076ca5aac12ea8a2a246941436d174389
Author: Paul Charsley <p.charsley@massey.ac.nz>
Date:   Sat, 10 Mar 2012 11:55:08 +0800
Tag:    v2.4.0-beta

Merge branch 'master' of git://git.moodle.org/moodle

commit 035c81c7bbcb6ae5322cbc3b0cd7fea585d73749
Author: Paul Charsley <p.charsley@massey.ac.nz>
Date:   Mon, 27 Feb 2012 18:19:23 +0800
Tag:    v2.4.0-beta

Merge branch 'master' of github.com:Lightwork-Marking/moodle

commit 9ea62d00441d05ff5064c293c2192cb46a2ad341
Author: Paul Charsley <p.charsley@massey.ac.nz>
Date:   Mon, 27 Feb 2012 05:47:35 +0800
Tag:    v2.4.0-beta

Merge branch 'master' of https://github.com/moodle/moodle

commit c8802ce4068c7173807da4eb0bafcb37a24a6144
Author: Paul Charsley <p.charsley@massey.ac.nz>
Date:   Sun, 26 Feb 2012 18:07:21 +0800
Tag:    v2.4.0-beta

Merge branch 'master' of git://git.moodle.org/moodle

commit 32bf9b8eac225f45d0c05dac2056b8bf293685a1
Author: Paul Charsley <p.charsley@massey.ac.nz>
Date:   Fri, 10 Feb 2012 12:50:30 +0800
Tag:    v2.4.0-beta

Merge branch 'master' of https://github.com/moodle/moodle