Git merges in Moodle 2.3.4 by Sam Hemelryk

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

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

commit fc77cb3d85278200d49ffa803934ca169d10ca10
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 09:14:28 +0800
Tag:    v2.3.4

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

commit 178a5b4102cba92eb3969b0fd2f102e75646a286
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 08:44:36 +0800
Tag:    v2.3.4

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

commit 52817fdbbcd9508098bf2070a6edf78bb1c1c09e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 08:39:52 +0800
Tag:    v2.3.4

Merge branch 'MDL-37068_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 757376d7dd2635368d69566d95131a2f1f202a1c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 08:33:45 +0800
Tag:    v2.3.4

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

commit a68bc19fa6031a6a697f508baa21d4d04275f272
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 07:04:51 +0800
Tag:    v2.3.4

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

commit d9402acd03e114cd15245bbd7338f25f747e3b1b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 05:14:54 +0800
Tag:    v2.3.4

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

commit a3a84720d3c9b55041283f22327d3928c58a5bc0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 04:34:52 +0800
Tag:    v2.3.4

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

commit a589b0dc77c13fe0fafb03bbd134a6b40c12bf98
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 04:15:34 +0800
Tag:    v2.3.4

Merge branch 'MDL-36741_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE

commit 185eff01fa4d89bb85ffbf351c932539fe02f0d1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 06:43:37 +0800
Tag:    v2.3.4

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

commit fec305739d9d9a32829c2e17b852b631529d6709
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 06:16:07 +0800
Tag:    v2.3.4

Merge branch 'MDL-36966-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

commit 2c292b48da41ce48e1bb17d789889a2737fb7e14
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 04:40:36 +0800
Tag:    v2.3.4

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

commit 59fc0958d6f0069518d135d4ddf99037e32c70c7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:24:32 +0800
Tag:    v2.3.4

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

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

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

commit 5c65ad28b4a1eecb2d253f31bff387615e4b734e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:07:03 +0800
Tag:    v2.3.4

Merge branch 'MDL-35530_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit 6c9a77ba0cd00c0b0cb665094aa5dd1969c0fcb7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 04:56:58 +0800
Tag:    v2.3.4

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

commit 20da16bb775d9264b78271b2d62a7bb2e2c675d2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 04:51:30 +0800
Tag:    v2.3.4

Merge branch 'MDL-32245_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

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

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

commit 3ad9a3fda38662ce994b830e05a5cab239ec7c49
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 06:09:32 +0800
Tag:    v2.3.4

Merge branch 'MDL-27619_23' of git://github.com/pauln/moodle into MOODLE_23_STABLE

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

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

commit 09fc0fde35e3cf3741bc829bfdb09daf48d42c5b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:38:27 +0800
Tag:    v2.3.4

Merge branch 'MDL-35593-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE

commit 6e89cdb35ff941c701952a36d0cee9af8a5a41fc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:34:31 +0800
Tag:    v2.3.4

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

commit eb4933515075040302ea9d140d0decedf461c0cf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:28:58 +0800
Tag:    v2.3.4

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

commit 39a36d7d7b1b4274c0888c31cbc55642ea9c19bb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 11:11:08 +0800
Tag:    v2.3.4

Merge branch 'MDL-36650_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit b54470f497323a553b3af4fcfcc124f204d84d90
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 11:04:13 +0800
Tag:    v2.3.4

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

commit 237ea8768c92a70cfb3420371657b09a85244180
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:44:32 +0800
Tag:    v2.3.4

Merge branch 'MDL-36905_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit 2e6538382a5c11615aa068990b4373c2f85ad59d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:04:17 +0800
Tag:    v2.3.4

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

commit b74804c8a80704819880a27da7d65ca848fcf69d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 09:59:50 +0800
Tag:    v2.3.4

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

commit 3c805e592c1567a77cbcca7abe449736db6a5f1a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 05:10:07 +0800
Tag:    v2.3.4

Merge branch 'MDL-36263-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

commit f1cf05cbbe2cd329207f6932eb6f440c21fe2529
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 04:41:49 +0800
Tag:    v2.3.4

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

commit 667dfa5e7c0af06b4bc951604ee5bce8fe1f033a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 04:14:59 +0800
Tag:    v2.3.4

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

commit a9269beb9c990a483d54a6f1b9af535b3e95ffd2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:59:31 +0800
Tag:    v2.3.4

Merge branch 'MDL-30961-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE

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

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

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

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

commit b35e30e5bcc939e966b92df13402852de6d13df4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:21:08 +0800
Tag:    v2.3.4

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

commit 1f0e0ab503579d0824feb4602a9983061297c339
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:12:24 +0800
Tag:    v2.3.4

Merge branch 'MDL-36607_dndBlocks' of https://github.com/moodlerooms/moodle into MOODLE_23_STABLE

commit 2353df33a7061804aef8446e418195fad7c6f487
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 07:13:10 +0800
Tag:    v2.3.4

Merge branch 'MDL-36433' of git://github.com/itamart/moodle into MOODLE_23_STABLE

commit f382da5bf9b1ac9ef50c4a0054e86d08febce559
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 06:51:20 +0800
Tag:    v2.3.4

Merge branch 'MDL-36778-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit 0d7605389332707ce64cec26fc590c1d30dec806
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 06:47:44 +0800
Tag:    v2.3.4

Merge branch 'MDL-36887-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit 46210e38e838960afc17cdba931f120ce82abec5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 06:42:35 +0800
Tag:    v2.3.4

Merge branch 'MDL-36640-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE

commit 532577bb97a8b31f53f8dc792598a9a727d0afff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:58:50 +0800
Tag:    v2.3.4

Merge branch 'message_nav_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit 5b2b3bdaf8973db40d6134cc559da39245618560
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:54:00 +0800
Tag:    v2.3.4

Merge branch 'MDL-36761_loop_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit b88caf890d684b979363eea75d4733a168489313
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:48:33 +0800
Tag:    v2.3.4

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

commit 45fd888c52c51fe58c7ddee5f027b26d319d1604
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:41:20 +0800
Tag:    v2.3.4

Merge branch 'wip-MDL-35221-MOODLE_23_STABLE' of git://github.com/kwiliarty/moodle into MOODLE_23_STABLE

commit f384987eadf5f9522af5d264297ae936220ace3d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:33:33 +0800
Tag:    v2.3.4

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

commit 4dd8a25f5ddb61920f176e8eb691cf018e443133
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:27:07 +0800
Tag:    v2.3.4

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

commit 289f5e85e73daea1326ea11da5958ea84a09acac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:23:35 +0800
Tag:    v2.3.4

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

commit cf0451133fa4f668e763e5909747ac82a761c279
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:19:22 +0800
Tag:    v2.3.4

Merge branch 'MDL-33125_23' of git://github.com/aolley/moodle into MOODLE_23_STABLE

commit 0b7a458885807313ada12471a902eff8f6c321c5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 28 Nov 2012 06:47:53 +0800
Tag:    v2.3.4

Merge branch 'MDL-36336_MOODLE_23_STABLE' of git://github.com/moodlerooms/moodle into MOODLE_23_STABLE

commit 01afb8024f4bd601c2eb007fa79a67b95e9d23dd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 28 Nov 2012 06:41:35 +0800
Tag:    v2.3.4

Merge branch 'wip-mdl-36238-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit 03af084b52430fadba85b372f0343f2c5ed902cb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 28 Nov 2012 06:24:56 +0800
Tag:    v2.3.4

Merge branch 'wip-MDL-34530_MOODLE_23_STABLE' of git://github.com/jason-platts/moodle into MOODLE_23_STABLE

commit 4254a7495c041a01aed5687cbb2a38461dc5894a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 28 Nov 2012 06:12:30 +0800
Tag:    v2.3.4

Merge branch 'MDL-36012-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

commit 13669ef4d8afa5dddac5e6be4756fd477bfae8db
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Nov 2012 06:21:55 +0800
Tag:    v2.3.4

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

commit 77f3688b2fed13c838eab607444845650ea77d8e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Nov 2012 06:10:25 +0800
Tag:    v2.3.4

Merge branch 'MDL-35760_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE

commit 4c14127cdbeb97c1cf3f4d45f925616638b97c85
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Nov 2012 05:40:57 +0800
Tag:    v2.3.4

Merge branch 'MDL-36760_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 55f8a9c7666230fe27362e38a8ed59c8771bd37a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Nov 2012 09:57:57 +0800
Tag:    v2.3.4

Merge branch 'MDL-36609_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE

commit f9fa262aa92f05d066ee03016d9af513527a4158
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Nov 2012 09:44:27 +0800
Tag:    v2.3.4

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

commit 8f718da4371f3bab75efebe0c0e89c153e8df25d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Nov 2012 06:42:13 +0800
Tag:    v2.3.4

Merge branch 'MDL-36763-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE

commit 703b86eefbf4b529295ee36d040ab4df94a1b5e2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Nov 2012 05:31:57 +0800
Tag:    v2.3.4

Merge branch 'MDL-35963-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

commit fa99332779da6fe33909bf5e8e275947be19de4f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Nov 2012 04:00:17 +0800
Tag:    v2.3.4

Merge branch 'MDL-25552_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE

commit 99072482f656198eca1a783ea18d26f54b366827
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Nov 2012 09:55:22 +0800
Tag:    v2.3.4

Merge branch 'MDL-36589_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE