Git merges in Moodle 2.4.1 by Dan Poltawski

commit 2e25f806fb060b52089ef4bb66fc6d32eca46879
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 14:46:25 +0800
Tag:    v2.4.1

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

commit 9910a5d7ebfada442df70ad82441bdfaf41993ce
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 12:17:58 +0800
Tag:    v2.4.1

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

commit 7c8fb69b1ce9a904f9e7fdf18b2d6eac6673368e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 11:16:49 +0800
Tag:    v2.4.1

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

commit ef42830b87bf0ceb176c757811b5273a72239829
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 10:54:14 +0800
Tag:    v2.4.1

Merge branch 'MDL-31641_drag_drop_help_24' of git://github.com/davosmith/moodle into MOODLE_24_STABLE

commit 9a1ac11640a17cece51bf82c099ee21b2ba3156b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 10:30:58 +0800
Tag:    v2.4.1

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

commit 04ab55dd4fd0d027d966bf0e9880ac2a9e2611da
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 10:27:00 +0800
Tag:    v2.4.1

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

commit b2e3fb3dc9f00cfc11a73e26e5dc1427cee936c1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 10:24:11 +0800
Tag:    v2.4.1

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

commit 850aa189e48d74f0f82fe7e1094c64df88e64637
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Jan 2013 13:57:02 +0800
Tag:    v2.4.1

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

commit c5e96ad32f14545a0e587633ea20039359074986
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Jan 2013 13:53:19 +0800
Tag:    v2.4.1

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

commit 9acc49eb937df552bd1bc8aa4fc4f9752e2cb62c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Jan 2013 13:30:34 +0800
Tag:    v2.4.1

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

commit 181b7f5fea307c8668aa3e2c4f4fbe2c6bff0a74
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Jan 2013 09:44:59 +0800
Tag:    v2.4.1

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

commit e17644cca34e3d7ad44a92f300f3bffa83950e16
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 24 Dec 2012 11:34:45 +0800
Tag:    v2.4.1

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

commit d71b142446bf092abcedd5e81e7a5da5683ac06d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 24 Dec 2012 11:22:48 +0800
Tag:    v2.4.1

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

commit b61dd8b29969710b9a70261851dac1bc01c5e8f9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 24 Dec 2012 10:55:24 +0800
Tag:    v2.4.1

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

commit 41bbc354711be899026417d65a7a459f4bb113dc
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 24 Dec 2012 10:35:40 +0800
Tag:    v2.4.1

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

commit eddec247523ca1ce868ddc298d0ac8caa9819f41
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Dec 2012 14:52:33 +0800
Tag:    v2.4.1

Merge branch 'MDL-37014_webdav_folders_24' of git://github.com/davosmith/moodle into MOODLE_24_STABLE

commit 2de5b09d8459a79a38a1d2fcdf45ff4ad5f46d32
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Dec 2012 09:11:02 +0800
Tag:    v2.4.1

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

commit e8e9393e76c0181c653bd9ce1a55e5bf5d91c0c6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 15:29:07 +0800
Tag:    v2.4.1

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

commit 973fe984cd51671d87d13f003041241040529c2e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 13:53:06 +0800
Tag:    v2.4.1

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

commit da264959f28044fa68560f9f49faae87f36d74af
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 12:05:12 +0800
Tag:    v2.4.1

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

commit 41e1109c5f3ea3410c8f5a7a55bc62dca8f590c1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 11:52:59 +0800
Tag:    v2.4.1

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

commit 209b2f7b3e4b99204b0fa1efa0f53e0c64612c6d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 11:48:39 +0800
Tag:    v2.4.1

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

commit 503325ddcb833bd5890fa14e99ef42c0b2e2e06e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 11:37:02 +0800
Tag:    v2.4.1

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

commit 9261144beb820d54966cba465ebce2b9267296b2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 17:54:37 +0800
Tag:    v2.4.1

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

commit 865485fc54f44815ec62e8e91c2dea50481c2e7b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 16:03:34 +0800
Tag:    v2.4.1

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

commit 7c431a345f13e5edf19b22fb933ddb1f0f04c605
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 15:19:08 +0800
Tag:    v2.4.1

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

commit fac9ba991b4b3786e707b8ae858b02b7dd4fce85
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 12:09:34 +0800
Tag:    v2.4.1

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

commit ae5ecea065690d44a6ce135db30ec5e1c5e9ffac
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 12:07:13 +0800
Tag:    v2.4.1

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

commit 4afa0b50c71b4b1503041afeaaa81de72af09942
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 11:33:14 +0800
Tag:    v2.4.1

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

commit b90b9b83bd61c67386ed1126ab0e392dc2e55c59
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 11:17:33 +0800
Tag:    v2.4.1

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

commit fddbdb79db922fcb26bcb9f07a18ca2c4c300de0
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 10:31:36 +0800
Tag:    v2.4.1

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

commit 86e28894f4060b4b7cb459181c8b0cad99eec281
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 19:37:31 +0800
Tag:    v2.4.1

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

commit c125bb553d911556db7f219d5b9cb2723ca8aeaf
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 19:33:21 +0800
Tag:    v2.4.1

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

commit 71e8ee1c33a1b5cf7d2516e2e2b1cd6bf26b7088
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 13:13:03 +0800
Tag:    v2.4.1

Merge branch 'MDL-36538_webdav_memory_24' of git://github.com/davosmith/moodle into MOODLE_24_STABLE

commit 8938f0848e54d82eb5be1e01f64f255317bcaed8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 12:03:23 +0800
Tag:    v2.4.1

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

commit 9321379b100ef2860d7a9eddfd28abfb0da55595
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 11:08:51 +0800
Tag:    v2.4.1

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

commit 9b1f784178e7134a1c9701802d45791d9a58e5a9
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 06 Dec 2012 12:04:08 +0800
Tag:    v2.4.1

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

commit 0c767bf6cc75b598551495b4886b55cd784bcf97
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 06 Dec 2012 10:57:13 +0800
Tag:    v2.4.1

Merge branch 'MDL-36963-deployment-backup_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE