Git merges in Moodle 2.4.7 by Dan Poltawski

commit b1455d0d74518e678541c6af68aaa4eecd928ce1
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 07 Nov 2013 11:44:53 +0800
Tag:    v2.4.7

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

commit cad44b47782c6783136291f22fe3ee4e9b12f0c4
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 07 Nov 2013 09:37:14 +0800
Tag:    v2.4.7

Merge branch 'MDL-42728-en_fix_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE

commit 7fd34aa0e659ffa955b81e5c4a328963d5b42b74
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Nov 2013 16:46:36 +0800
Tag:    v2.4.7

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

commit 08a8eb917e0e9330e6231c8219e07795176175d5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 22:54:20 +0800
Tag:    v2.4.7

Merge branch 'wip-MDL-42270_M24_2' of git://github.com/gjb2048/moodle into MOODLE_24_STABLE

commit df78a7902be662c06b9757db22675caf2cd07509
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 22:35:09 +0800
Tag:    v2.4.7

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

commit 43fa28331e06c78b01675588248bf3f13b7cf1dd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 22:17:22 +0800
Tag:    v2.4.7

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

commit 8a7078b28baa98b1ba0bc0202cfa89be79ffdd67
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 21:55:40 +0800
Tag:    v2.4.7

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

commit dcb6e4169b6959e0b7b3a010cd00bd9a1a7e00b5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 17:21:32 +0800
Tag:    v2.4.7

Merge branch '42350-24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit 8cd148efe0b2064ea2271c901b93d5fb7fcfbd6f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 16:22:50 +0800
Tag:    v2.4.7

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

commit 23ea3287eaf9a58e8e7c3fdf73d2ca66105f875d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 15:31:37 +0800
Tag:    v2.4.7

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

commit 42cc95c2458785b96de2910cf362f96ed9f1592d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 14:52:24 +0800
Tag:    v2.4.7

Merge branch 'MDL-42494-workshop-exception_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE

commit d120a7baf22b627cc44da067e16059b1a838a387
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 12:10:58 +0800
Tag:    v2.4.7

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

commit eef875e0c147c796b678b093ae361b0badf85cdf
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 01 Nov 2013 15:47:42 +0800
Tag:    v2.4.7

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

commit 0bc96042122d21e252754b8531e20573cf41f3cd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Oct 2013 16:31:38 +0800
Tag:    v2.4.7

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

commit acb1bf6facef029dc9fa453b24126dc962a00b74
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Oct 2013 11:33:36 +0800
Tag:    v2.4.7

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

commit 8f19a957e2aa9d5ec9a0c5f5a236f7b0a8ea83d9
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Oct 2013 16:29:19 +0800
Tag:    v2.4.7

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

commit 7a2db63954cf5eb0b233bba24d38ff1589d6c1d3
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Oct 2013 12:36:38 +0800
Tag:    v2.4.7

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

commit af90211efd2faa60c0bc2586bfb4afbd748bddcf
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Oct 2013 16:45:17 +0800
Tag:    v2.4.7

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

commit 1640389bcf08d4d0c9833d2488c264c283a190d8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Oct 2013 13:21:27 +0800
Tag:    v2.4.7

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

commit 2811b3d26257bb063fe196964a9928c5e65f1a39
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Oct 2013 10:30:43 +0800
Tag:    v2.4.7

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

commit a122d9534373cff774dd06e24e8feb2e4362b59b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Oct 2013 13:58:40 +0800
Tag:    v2.4.7

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

commit bd1fae5fc021412cf2cc423eff25a34f7a642ef1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Oct 2013 11:25:27 +0800
Tag:    v2.4.7

Merge branch 'MDL-26244_url_24' of https://github.com/andyjdavis/moodle into MOODLE_24_STABLE

commit 57bafe6ebcf293235e9c77f05e5705f6ac8726c5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Oct 2013 10:59:00 +0800
Tag:    v2.4.7

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

commit 6123c76bc73156b1e4736d939f8b443db929a174
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Oct 2013 16:16:34 +0800
Tag:    v2.4.7

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

commit 98e4f24ff6a275b3ecc4d7221d9d0b2ee85a5183
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Oct 2013 12:15:43 +0800
Tag:    v2.4.7

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

commit 8a2e491ee7d08fcdfd39184273b7956f739c5e0b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Oct 2013 14:43:21 +0800
Tag:    v2.4.7

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

commit ac7f6f4b9676b33774be87ac112b0c56f32cc082
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Oct 2013 14:36:29 +0800
Tag:    v2.4.7

Merge branch 'w42_MDL-42082_m24_authdbpass' of https://github.com/skodak/moodle into MOODLE_24_STABLE

commit 1fc88334a6e87fabc657c33d5f0c0b5d92a5f83f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Oct 2013 14:24:17 +0800
Tag:    v2.4.7

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

commit 34b3d144fee5bafa257ec98f619c786c60742c03
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Oct 2013 12:12:17 +0800
Tag:    v2.4.7

Merge branch 'MDL-41672-text-mail-links_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE

commit 39adfbde72090ac166d0b3b9f239d65c37f4d15c
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Oct 2013 18:20:13 +0800
Tag:    v2.4.7

Merge branch 'w41_MDL-42054_m24_phpmailertesting_i' of https://github.com/skodak/moodle into MOODLE_24_STABLE

commit d6b99cf123eb6b2b6c91056c145661e94bafd455
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Oct 2013 16:54:30 +0800
Tag:    v2.4.7

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

commit 77eb24f886e06e51bd97fa70008e63008db298fc
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Oct 2013 16:48:44 +0800
Tag:    v2.4.7

Merge branch 'm24_MDL-40226_Add_JNLP_MIME_Type_Support' of https://github.com/scara/moodle into MOODLE_24_STABLE

commit 925ec67b22d85afd2678857b95ae16f66c0b1b36
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Oct 2013 13:21:44 +0800
Tag:    v2.4.7

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

commit 18cbf0db95f38daec4e39dfa5eb1440678667529
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 11 Sep 2013 12:00:15 +0800
Tag:    v2.4.7

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

commit 5e99c1f9a111f551a27efbeb757e6f1c48707357
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 14:32:00 +0800
Tag:    v2.4.7

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

commit 84197f41ca03cc53f7dbfaeb7ff00bd8f0f9516e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 14:12:30 +0800
Tag:    v2.4.7

Merge branch '41189-24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit 4b3521ec6954fd70c917ffc986a24ba3f9d4b8bf
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 12:05:10 +0800
Tag:    v2.4.7

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

commit e9ea8e9b6344e847db48cc5f5389baf38aaa56f6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Sep 2013 18:04:48 +0800
Tag:    v2.4.7

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

commit 4da2fefa4dc955b4100cd28ba6c59e8e0181835a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Sep 2013 17:13:49 +0800
Tag:    v2.4.7

Merge branch 'MDL-37804_24' of github.com:recreate/moodle into MOODLE_24_STABLE

commit 8baa0cab9845510675c6f980a5b1ddcdff605e7c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Sep 2013 15:39:58 +0800
Tag:    v2.4.7

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