Git merges in Moodle 2.4.2 by Dan Poltawski

commit 6b5dc09867390c8398ffef1894724ef4b730a813
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Feb 2013 11:00:11 +0800
Tag:    v2.4.2

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

commit 45551ed4df0312ba8db62777e1e54dc32b864b27
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Feb 2013 10:20:55 +0800
Tag:    v2.4.2

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

commit 349a6fde3734989a26af21976ae0bfcc8e6a8b4a
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 20 Feb 2013 14:27:52 +0800
Tag:    v2.4.2

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

commit 8fbdd7cd1ed60db40c99b1717c01495008b874c3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Feb 2013 14:07:20 +0800
Tag:    v2.4.2

Merge branch 'w07_MDL-38059_m24_cachedir' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit e2b55c9c34e0a0c2fe06d50035642e15a780223b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Feb 2013 13:44:27 +0800
Tag:    v2.4.2

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

commit bf0c578f16fc369e2879b1eaf9db4d80629403a2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Feb 2013 13:41:55 +0800
Tag:    v2.4.2

Merge branch 'm24_MDL-37449_Reports_ORA-00918_column_ambiguously_defined' of https://github.com/scara/moodle into MOODLE_24_STABLE

commit e23d098117205e2fb3ee40f8cfe54040bde91b8d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Feb 2013 12:25:30 +0800
Tag:    v2.4.2

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

commit ff7a5181199618ed1a7498b705b95c704e81e36f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Feb 2013 11:23:46 +0800
Tag:    v2.4.2

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

commit 0141a869ebf93f089798ad03e45377e4b8f6a6bf
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Feb 2013 10:56:37 +0800
Tag:    v2.4.2

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

commit 0e3d1236f8f2e703162c3ff29286df27691168d5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Feb 2013 15:59:56 +0800
Tag:    v2.4.2

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

commit ff1d6556a7871ca2c49267fe5bfbadefa0786314
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Feb 2013 14:27:40 +0800
Tag:    v2.4.2

Merge branch 'MDL-37396_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE

commit 9d0c759ed1eae2155b712d5ab4c38019b604f185
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Feb 2013 14:18:36 +0800
Tag:    v2.4.2

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

commit 047f7aa46c7db8b40e09fe97a923858931085dfc
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Feb 2013 12:24:12 +0800
Tag:    v2.4.2

Merge branch 'MDL-35336_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE

commit a2f6f882c4cb2edb7168f21d903d99196eb47cda
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Feb 2013 11:33:00 +0800
Tag:    v2.4.2

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

commit f4fb6d9898299604b030e61b5cf03953641ce9e0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Feb 2013 11:07:40 +0800
Tag:    v2.4.2

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

commit 6d5f4fd536e80594e8d64f1a90207f0c4452ac6d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Feb 2013 16:13:55 +0800
Tag:    v2.4.2

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

commit db41eeb8bdf049568d58f46b9753cf0789dca5a3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Feb 2013 15:49:55 +0800
Tag:    v2.4.2

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

commit dbdcc42eee203eb18d8b9853f107fb5d6a3e2770
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Feb 2013 14:42:35 +0800
Tag:    v2.4.2

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

commit 25da21638987834f59f5ea50b5d5ae3154f2cf21
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Feb 2013 13:47:44 +0800
Tag:    v2.4.2

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

commit 519375f9fedc1a6170a587a496bcb37dd982aaf5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Feb 2013 13:39:34 +0800
Tag:    v2.4.2

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

commit ccc32eba0618764aa1727bc57e2d05cb380b655d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Feb 2013 13:36:04 +0800
Tag:    v2.4.2

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

commit 09931f8158094a4df88411145ff41273c8edccb7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Feb 2013 10:34:15 +0800
Tag:    v2.4.2

Merge branch 'wip-MDL-34798_M24-2' of git://github.com/gjb2048/moodle into MOODLE_24_STABLE

commit 6cf9f04cd6f7bd98855eb3fee6ccac098117beb3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Feb 2013 09:46:08 +0800
Tag:    v2.4.2

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

commit af5d66f9990fe5e1841ce39e82e6c55613085c6d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Feb 2013 14:33:27 +0800
Tag:    v2.4.2

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

commit 8b2034bc7b82033c2abcdad5e38443c40d35c846
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Feb 2013 13:58:47 +0800
Tag:    v2.4.2

Merge branch 'MDL-37797_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE

commit 44a29a501a1bc4f30147065ee27fba351513e1f1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Feb 2013 12:43:15 +0800
Tag:    v2.4.2

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

commit 7298cf7db35ca0f1484f8c446fa843a199d84fe3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Feb 2013 10:26:21 +0800
Tag:    v2.4.2

Merge branch 'wip-MDL-36322-m24' of https://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit d5822fbfd70ec9b581764bc85494d29f152dde4a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Feb 2013 09:58:10 +0800
Tag:    v2.4.2

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

commit bfc80ec4e8900156ff3bfa2f3cbf805e7fe8e32d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Feb 2013 16:14:12 +0800
Tag:    v2.4.2

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

commit 64d4729f3d1af5c8f432068915052915912fc73d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Feb 2013 15:56:15 +0800
Tag:    v2.4.2

Merge branch 'm24_MDL-29207' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE

commit 3fd6f7e088df00a49c97ce3649675750ba52df05
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Feb 2013 14:30:48 +0800
Tag:    v2.4.2

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

commit 2cb6f681797485e9ae3a6ed5470238b29b542468
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Feb 2013 13:49:32 +0800
Tag:    v2.4.2

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

commit 8b447463adc7cabff6d1d0b130e3cd925d101557
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Feb 2013 12:12:56 +0800
Tag:    v2.4.2

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

commit 3e0ddd4cfd302cc281e8fc9bdf70e7bae3d5e7aa
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Feb 2013 11:57:15 +0800
Tag:    v2.4.2

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

commit a6bd6fcd4136990b9f4270790a9730aab43e1dd4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Feb 2013 10:17:46 +0800
Tag:    v2.4.2

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

commit 56f84f2b99875afb75ed846dbe83c849c3c49221
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Feb 2013 10:13:58 +0800
Tag:    v2.4.2

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

commit d070222f6963126a56406ab4222f03523ea88981
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 31 Jan 2013 10:14:53 +0800
Tag:    v2.4.2

Merge branch 'm24_MDL-34231' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE

commit adedab33de41b762594ab4dcfd8099c4052948fb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Jan 2013 11:54:42 +0800
Tag:    v2.4.2

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

commit f0e846b410417a54eb58799ba58fbfeab22370a5
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 Jan 2013 15:57:52 +0800
Tag:    v2.4.2

Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE

commit 87eb1d645ff266fd6687a3086e832b4c205a9676
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 Jan 2013 12:35:55 +0800
Tag:    v2.4.2

Merge branch 'MDL-37473b-24' of git://github.com/srynot4sale/moodle into MOODLE_24_STABLE

commit 13d03939a67927e6443d157e8b313b7a3232380a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 14:00:34 +0800
Tag:    v2.4.2

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

commit 83d4aee03c813e1faeecca40a2bf167c27a04668
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 12:51:59 +0800
Tag:    v2.4.2

Merge branch 'MDL-27164-MOODLE_24_STABLE' of git://github.com/micaherne/moodle into MOODLE_24_STABLE

commit c57ed7626534c24ae4708bfa01c2799a0825045a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 12:49:26 +0800
Tag:    v2.4.2

Merge branch 'm24_MDL-36853' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE

commit 1bb2d65bb2bee57547879315e7c6857b7f519214
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 12:46:16 +0800
Tag:    v2.4.2

Merge branch 'MDL-37275_m24' of git://github.com/markn86/moodle into MOODLE_24_STABLE

commit 3dae8bcedda31096a66d99c96faf2675ebce9182
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 12:43:55 +0800
Tag:    v2.4.2

Merge branch 'MDL-37375_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE

commit 9f8b8bbd370062b3f87c30f904fb369c7b0fbaa9
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 12:36:06 +0800
Tag:    v2.4.2

Merge branch 'w03_MDL-37593_m24_httpslogineditor' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 82cb942bff0d9ee3c8d3dee63908fb9d0ada9b43
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 11:53:38 +0800
Tag:    v2.4.2

Merge branch 'MDL-37430-24' of github.com:damyon/moodle into MOODLE_24_STABLE

commit facd17c1ced2cedd0da6dbca87153b879a30c288
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 11:48:16 +0800
Tag:    v2.4.2

Merge branch 'MDL-35357_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE

commit 76c98ace9afea89126d9b02ac6a8a15e9c518a48
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 11:40:14 +0800
Tag:    v2.4.2

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

commit f5222c7416a169d1dcfa8349c3196a24f3111484
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 11:14:32 +0800
Tag:    v2.4.2

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

commit bd541e24b3f990956dd1705582c0f90d4a7e8a23
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 09:06:30 +0800
Tag:    v2.4.2

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

commit 4ef2160966d35f1ca36eea757468401106ddd662
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Jan 2013 10:25:51 +0800
Tag:    v2.4.2

Merge branch 'MDL-30769_iframe_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE

commit 171c3af4615f7b66cba706ff4c9888e3a088996d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Jan 2013 10:15:22 +0800
Tag:    v2.4.2

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

commit c44fe3050e5c032412616e7e12d788717899e2c4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Jan 2013 10:08:58 +0800
Tag:    v2.4.2

Merge branch 'MDL-35074_24_2' of git://github.com/pauln/moodle into MOODLE_24_STABLE

commit 6ee3f386bd2f29ded9223857589941a3e9218a7c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Jan 2013 10:03:49 +0800
Tag:    v2.4.2

Merge branch 'MDL-37527-24' of github.com:damyon/moodle into MOODLE_24_STABLE

commit cf82c45de999f3fb872f83341c91c9afc2865bd4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Jan 2013 09:01:13 +0800
Tag:    v2.4.2

Merge branch 'm24_MDL-36421' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE

commit 425894422b625c104c4d8e96d14aef09e531fa33
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Jan 2013 14:30:30 +0800
Tag:    v2.4.2

Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE

commit cf75be653bcb32fe927bb91d97836fbe34f5136d
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 17 Jan 2013 13:47:44 +0800
Tag:    v2.4.2

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

commit 2540839f5816e6316a6cba4eff563a1b9e66910f
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 17 Jan 2013 10:23:07 +0800
Tag:    v2.4.2

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

commit 9044bc2f8b2764d92c59ae68edda185f89d69186
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Jan 2013 13:52:07 +0800
Tag:    v2.4.2

Merge branch 'wip-MDL-37536-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit 7a82b70970569ba81ed2976dab3def7e767d1329
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Jan 2013 09:39:54 +0800
Tag:    v2.4.2

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

commit 37784b037e4cc0c146148259747a02893e61a89d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 14:29:50 +0800
Tag:    v2.4.2

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

commit 9d49ca31b11fc296a6f1c50836232ef64787a0d7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 13:56:26 +0800
Tag:    v2.4.2

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

commit a79b88e20ced50d0327ecc37ab23472568e860ea
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 13:33:53 +0800
Tag:    v2.4.2

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

commit d9babbcce11563b698f8a5513159370475bbfd85
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 12:59:46 +0800
Tag:    v2.4.2

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

commit 391e361387363e629cf3e85a8c87d70e5bcecd91
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 12:41:46 +0800
Tag:    v2.4.2

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

commit 03e63438da96a75b07790b61cdb414360879a3e7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 11:48:18 +0800
Tag:    v2.4.2

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

commit 3b8535a38666f22f3d1e7cb7a125351752583f21
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 10:58:36 +0800
Tag:    v2.4.2

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

commit b4d896505bd4dc46c9b66387b50b391b5e413133
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 10:43:29 +0800
Tag:    v2.4.2

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

commit ee8044f2e64f75a2983f4831773efe197aafd3ba
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Jan 2013 15:26:16 +0800
Tag:    v2.4.2

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

commit 94c4afe13ac40365aba9cfed78f009fc54b1ee97
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Jan 2013 15:05:23 +0800
Tag:    v2.4.2

Merge branch 'wip-MDL-36297-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit b90eab06c794b81257cdbc45d2f247ec5dfe8e51
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Jan 2013 14:59:30 +0800
Tag:    v2.4.2

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