Git merges in Moodle 2.4.1 by Sam Hemelryk

commit d72a0aa2c8a6ac00d760091b6f5a0433c3dc6226
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jan 2013 09:06:50 +0800
Tag:    v2.4.1

Merge branch 'wip-mdl-36958-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE

commit 2be82d5e13017bcb45fffa81760243864b6999d8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jan 2013 09:00:23 +0800
Tag:    v2.4.1

Merge branch 'w51_MDL-35893_m24_perfinstall' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit e04f57c95b31720ebd9a434522caf251ffcf8fa1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 09:15:17 +0800
Tag:    v2.4.1

Merge branch 'MDL-37161-moodle24' of https://github.com/StudiUM/moodle into MOODLE_24_STABLE

commit b9639c524d45863cd5ca4d167c677bd9833674cd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 08:44:54 +0800
Tag:    v2.4.1

Merge branch 'w51_MDL-36212_m24_entities' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 192cb8f89449ddfc4a13b1ea1e2aad6d1fd301f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 08:35:04 +0800
Tag:    v2.4.1

Merge branch 'w51_MDL-37281_m24_othersnav' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 2d7c42275f190324949d7fb1b2a6ec2a7b49ce68
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 07:05:07 +0800
Tag:    v2.4.1

Merge branch 'MDL-36855-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE

commit 49a66d4b68f9ad8531d2046ffffd1a7120a3f803
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 05:15:11 +0800
Tag:    v2.4.1

Merge branch 'MDL-16730-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE

commit 1a5a5f8e9c9532fefc1e5a7e4ffcf008f4c1bec5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 04:52:50 +0800
Tag:    v2.4.1

Merge branch 'w51_MDL-37105_m24_catlimit' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 2c6b79365b937b2fe6596bf6e28ab5e82b866ac2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 04:35:07 +0800
Tag:    v2.4.1

Merge branch 'MDL-29327_none_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE

commit 0c1be2af2178fbb4c4309e6f2f5e12b35cbef8de
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 04:09:25 +0800
Tag:    v2.4.1

Merge branch 'w51_MDL-37315_m24_ldappaging' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit b09c5ac837a52746e40d42ca0d801f9d07b10976
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 06:43:46 +0800
Tag:    v2.4.1

Merge branch 'wip-MDL-35833-stable24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE

commit 3124654247af515e5556715698ec3ab46efbbbcd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 05:55:19 +0800
Tag:    v2.4.1

Merge branch 'wip-mdl-37015-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE

commit 9a57563b9ff8b738bf117cd09a6a7bab9c7f9796
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 04:40:44 +0800
Tag:    v2.4.1

Merge branch 'wip-MDL-35653-MOODLE_24_STABLE' of git://github.com/abgreeve/moodle into MOODLE_24_STABLE

commit 730271af49dd0129d35a3cecb78612278eb504c0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:42:49 +0800
Tag:    v2.4.1

Merge branch 'w50_MDL-36475_m24_zindexesgrrr' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 8a35efacd7c6016a4473ded45b9e7e0c1bbabb6e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:40:32 +0800
Tag:    v2.4.1

Merge branch 'MDL-36490_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE

commit acb011dc20ba5df2f10a5fca0fcaac9f5c663efa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:24:42 +0800
Tag:    v2.4.1

Merge branch 'w50_MDL-37111_m24_forumsinglefirst' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit a7a1adf4e095154501e75581aabc689946758bb6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:12:22 +0800
Tag:    v2.4.1

Merge branch 'MDL-37176_24' of git://github.com/stronk7/moodle into MOODLE_24_STABLE

commit ddb5fb5980013f2f087dbcad3b6f9f0d3dfc197b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 04:57:11 +0800
Tag:    v2.4.1

Merge branch 'wip-MDL-35056-stable24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE

commit cd281ce1b41aa06962d049dfa3c1695a996ea452
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 04:42:41 +0800
Tag:    v2.4.1

Merge branch 'MDL-29733_master' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE

commit 1ce6bdd1ddb00b6599d0d8af277c696f9583d701
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:45:17 +0800
Tag:    v2.4.1

Merge branch 'MDL-29805-24' of git://github.com/mouneyrac/moodle into MOODLE_24_STABLE

commit c545dcad4ffc9ea7ce21062960d9bd5fdfc8a834
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:34:44 +0800
Tag:    v2.4.1

Merge branch 'wip_24_mdl-37088_bad_operator_ldap_sync_user' of https://github.com/iarenaza/moodle into MOODLE_24_STABLE

commit 9e9dd64c351b8925618a493b2336d9a7530e75ac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:29:12 +0800
Tag:    v2.4.1

Merge branch 'MDL-36321_message_participants_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE

commit 7027fe4538012a560d29a22254c932ad84330ba0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 11:04:19 +0800
Tag:    v2.4.1

Merge branch 'w49_MDL-36731_m24_uploadestrict' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 6ff174587334cdbf517871d8e1a400fccd2ec76a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:42:08 +0800
Tag:    v2.4.1

Merge branch 'MDL-36916' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit a2630c08ae8bc44673f2ba15fdb442d5c5d405b3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:35:04 +0800
Tag:    v2.4.1

Merge branch 'w49_MDL-36936_m24_composerdev' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 1c90b9976da578464ef7a199fc6d5e979a4d189e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:27:14 +0800
Tag:    v2.4.1

Merge branch 'w49_MDL-37060_m24_sessinit' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 35cb0e4a4c94707d6aaf6e5ad10fd020b4b376e1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:04:22 +0800
Tag:    v2.4.1

Merge branch 'MDL-36942' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit ada098890bd898478d649444c54c881b8c44fe63
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:00:00 +0800
Tag:    v2.4.1

Merge branch 'MDL-36954' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit b004c163ee13fc2b3fa8b7806be53f028a26992c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 09:53:49 +0800
Tag:    v2.4.1

Merge branch 'wip-mdl-37017-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE

commit 6d0c04c208b411e2c702e1f36e7bc33bc90ad4ac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 09:44:21 +0800
Tag:    v2.4.1

Merge branch 'w49_MDL-37061_m24_invalidlang' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit eda1d3f37ab348669f0b021c4a0d7faf1c752ad2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 05:22:06 +0800
Tag:    v2.4.1

Merge branch 'w49_MDL-29442_m24_entityutf8' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 52d4168038b29ce17b965f7bd6ea3b66bb17bdad
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 04:42:29 +0800
Tag:    v2.4.1

Merge branch 'MDL-36601-master' of git://git.luns.net.uk/moodle into MOODLE_24_STABLE

commit c6bd16545e13ec8ea1dc136fa1cf7558cd77465b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 04:16:43 +0800
Tag:    v2.4.1

Merge branch 'MDL-36805-master' of git://git.luns.net.uk/moodle into MOODLE_24_STABLE

commit 5e6b64571c440d3b96a916f970a88e5a7fc61e09
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:28:33 +0800
Tag:    v2.4.1

Merge branch 'MDL-34592_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE

commit c446a0fca2bcfd86f1bded274ce151c1d0f04419
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:24:18 +0800
Tag:    v2.4.1

Merge branch 'MDL-36608_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE

commit 07f89a017c5104107487c295942756f2ee8b6e81
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:21:25 +0800
Tag:    v2.4.1

Merge branch 'MDL-36978_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE

commit b8b1926e2f48cc0337f8c1e42c49ac6a81cb7ff7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:15:54 +0800
Tag:    v2.4.1

Merge branch 'MDL-36579_modLtiBackupFields' of git://github.com/moodlerooms/moodle into MOODLE_24_STABLE

commit 0b4767ca50dfdf6f8e5d081c0cc282984ee34901
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:48:59 +0800
Tag:    v2.4.1

Merge branch 'MDL-34591_24' of git://github.com/grabs/moodle into MOODLE_24_STABLE

commit 1b696de61bc654e82bd832499312a75db300145e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:23:44 +0800
Tag:    v2.4.1

Merge branch 'wip-MDL-37026-MOODLE_24_STABLE' of git://github.com/abgreeve/moodle into MOODLE_24_STABLE