Git merges in Moodle 2.5.3 by Dan Poltawski

commit 934c120bf7060a66acb8db935804aa0a324e05a2
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 07 Nov 2013 15:56:31 +0800
Tag:    v2.5.3

Merge branch 'MDL-42666-25-fixup' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit edb8542bae079843178ad29653859a7ddd00bfd1
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 07 Nov 2013 14:19:10 +0800
Tag:    v2.5.3

Merge branch 'MDL-42666-25-fixup' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit 95e92d994a4d3da4beea6dbeb9a2354f0beba09b
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 07 Nov 2013 11:44:45 +0800
Tag:    v2.5.3

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

commit dc7910cfb5d2dd39c28b586cd9088a57952fc927
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 07 Nov 2013 09:36:01 +0800
Tag:    v2.5.3

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

commit e9c05243e092dbb071642d58aeee1fb57b210c7c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Nov 2013 16:46:34 +0800
Tag:    v2.5.3

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

commit f6c01ed03d2e27379e7291f57e31374044978714
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Nov 2013 12:34:37 +0800
Tag:    v2.5.3

Merge branch 'MDL-42385_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit 9b8d886a7dc2df550410835d24867b32587f23eb
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 23:41:08 +0800
Tag:    v2.5.3

Merge branch 'MDL-42273-25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE

commit 9686f6db9b610409189557c46237495aa31dc6af
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 23:34:28 +0800
Tag:    v2.5.3

Merge branch 'MDL-42363_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit 742f8adac4811f05267737786b4edb9a0c5fa057
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 22:54:16 +0800
Tag:    v2.5.3

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

commit 23e3fe54493ebe9fad66e6d45c9b764934738a69
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 22:35:05 +0800
Tag:    v2.5.3

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

commit 028528e223feb22c2b0d96100850618a0a9d2219
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 22:17:20 +0800
Tag:    v2.5.3

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

commit 99870bc223defc118c9efa06249a3e62a7122aef
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 21:55:37 +0800
Tag:    v2.5.3

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

commit d06720b0b54e3e536c1bf6d88e9cbc82b8a3a758
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 21:43:49 +0800
Tag:    v2.5.3

Merge branch 'MDL-42326_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit 824105f80ff0f3c07b517d0f066838fda178cee7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 17:38:01 +0800
Tag:    v2.5.3

Merge branch '42350-25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE

commit 46ee24b31e4100e32dd78b5149fd3253efc631a4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 16:22:46 +0800
Tag:    v2.5.3

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

commit 162fe6fab21b41f3619f9c339e94e8167b6d1c45
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 16:14:39 +0800
Tag:    v2.5.3

Merge branch 'w45_MDL-42044_m25_zipaddon' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit fde722805f4d2dd1fc383f754d10e7bab5483b27
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 15:36:08 +0800
Tag:    v2.5.3

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

commit 9e947fe30363b0027f0dca9db95791153d0fb780
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 14:51:52 +0800
Tag:    v2.5.3

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

commit 8b03e53926efa0bd39334f69acfdedb0d76abf11
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 14:13:49 +0800
Tag:    v2.5.3

Merge branch 'MDL-42286_behat_25' of https://github.com/andyjdavis/moodle into MOODLE_25_STABLE

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

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

commit 7eaaf2dac87c3a7e3cb8d7222197d0e8fa805686
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 01 Nov 2013 17:38:03 +0800
Tag:    v2.5.3

Merge branch 'MDL-42287-25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE

commit 3eb7f7103b3519698166e94d27889bc7f1ef5197
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 01 Nov 2013 15:47:48 +0800
Tag:    v2.5.3

Merge branch 'install_25_STABLE' of git://git.moodle.org/moodle-install into MOODLE_25_STABLE

commit 3dcfa0e6aa84bbe51e891e2062c2152176e4f5db
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Oct 2013 11:44:36 +0800
Tag:    v2.5.3

Merge branch 'wip-mdl-42282-m25' of git://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE

commit 0da4fd0c21a6c9813003c156c16370315fd01d15
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Oct 2013 10:33:11 +0800
Tag:    v2.5.3

Merge branch 'wip-mdl-42281-m25' of git://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE

commit 796538b7866372316d0e3704b9d19079b1d3f265
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Oct 2013 16:31:30 +0800
Tag:    v2.5.3

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

commit 321a08bff96605089344a563d9e00f7088772ef3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Oct 2013 14:54:10 +0800
Tag:    v2.5.3

Merge branch 'wip-mdl-42283-m25' of git://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE

commit 3c137dafb375a046a96468a7f4d18470e9cbfc44
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Oct 2013 14:15:40 +0800
Tag:    v2.5.3

Merge branch 'MDL-42285-25' of git://github.com/phalacee/moodle into MOODLE_25_STABLE

commit 92642bed3cb18200a4a274e8bea3af60387b0c5a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Oct 2013 11:36:08 +0800
Tag:    v2.5.3

Merge branch 'MDL-42538_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit 3fa16c9c7b8bc6039b66d426619f68593abc23fa
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Oct 2013 11:33:27 +0800
Tag:    v2.5.3

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

commit ac48ed217dea425e572f06d35d0812ee44d280fb
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 Oct 2013 15:55:36 +0800
Tag:    v2.5.3

Merge branch 'wip-mdl-42536-m25' of git://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE

commit 3c78ccf5c47bdc3925b9cd377f05fde1cb81c798
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 Oct 2013 15:28:23 +0800
Tag:    v2.5.3

Merge branch 'MDL-42514-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit b629c8b24470e0ad299c45a59fcd1093d844cbe0
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 Oct 2013 12:01:42 +0800
Tag:    v2.5.3

Merge branch 'MDL-42272-25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE

commit 3a32362a3059ace0abe0151f0fe183aaf472cc55
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Oct 2013 16:29:11 +0800
Tag:    v2.5.3

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

commit 860553218c3b9dda1895b09e8750700fe10e41b2
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Oct 2013 13:42:09 +0800
Tag:    v2.5.3

Merge branch 'MDL-42272-25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE

commit 047f523d91bc167bdbf7be7aa2efd5311e7be0be
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Oct 2013 12:39:49 +0800
Tag:    v2.5.3

Merge branch 'MDL-42362_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit 7e24c4bbb203b8ee95cfd16839cb8b82fbc94bcd
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Oct 2013 12:33:21 +0800
Tag:    v2.5.3

Merge branch 'wip-MDL-42323-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit f9b6e96e5928a306a3e2e833a9709adaf969c485
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Oct 2013 10:27:45 +0800
Tag:    v2.5.3

Merge branch 'MDL-42293-25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE

commit 95fcab44800e263768ef5928b46ee306a6a388fc
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Oct 2013 17:14:37 +0800
Tag:    v2.5.3

Merge branch 'MDL-42324_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit fd60979576b8e3311aeabafa676634d43907331b
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Oct 2013 15:05:43 +0800
Tag:    v2.5.3

Merge branch 'MDL-42290-25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE

commit 7eed88eef94865da570c68d7a145d1deb8bd9d05
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Oct 2013 13:21:07 +0800
Tag:    v2.5.3

Merge branch 'wip-MDL-42278-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit 48c67d9c750bee7ff5e11cc14b910a0f97882b69
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Oct 2013 12:37:52 +0800
Tag:    v2.5.3

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

commit 68c4e246d6aa8c259b44097aa51c769c574def2f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Oct 2013 16:40:50 +0800
Tag:    v2.5.3

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

commit c2767fb45643e26b7f5b494f237c78306178fbfe
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Oct 2013 13:21:14 +0800
Tag:    v2.5.3

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

commit 065e6bf3860d005257e7c934626c498532ab4505
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Oct 2013 11:53:17 +0800
Tag:    v2.5.3

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

commit 9fcd4cc785c6775e41acedb71929c5448d5831e7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Oct 2013 10:26:41 +0800
Tag:    v2.5.3

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

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

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

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

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

commit 429cc7c8dc9b4e3f84e39a55148ebd76580c1316
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Oct 2013 11:15:50 +0800
Tag:    v2.5.3

Merge branch 'MDL-42408_25' of https://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit 6b2c8581fa7d5acb5214f6c7af24e6d6e9d776bb
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Oct 2013 10:58:24 +0800
Tag:    v2.5.3

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

commit ebb6f201ceede68b580cfdc72d2a85af2dab39a6
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Oct 2013 16:16:48 +0800
Tag:    v2.5.3

Merge branch 'install_25_STABLE' of git://git.moodle.org/moodle-install into MOODLE_25_STABLE

commit b390cce066511476b66b9c91da53780988f5d62c
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Oct 2013 12:15:11 +0800
Tag:    v2.5.3

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

commit f12a4819ef9de9c14ce5791679da80f7a1640a11
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Oct 2013 14:43:12 +0800
Tag:    v2.5.3

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

commit 26037c6e3dcdde9bb7b45e8d07a366914e931c99
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Oct 2013 11:53:03 +0800
Tag:    v2.5.3

Merge branch 'wip-MDL-42288-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit 4d2d515c47bb4ebc29a5c27251d7999ca9a950cf
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Oct 2013 16:12:05 +0800
Tag:    v2.5.3

Merge branch 'MDL-42151_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit 9070663ecd208dcf981cb69e557a16260f62a834
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Oct 2013 14:36:22 +0800
Tag:    v2.5.3

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

commit 73dc6a5b52ce6fc15e98071eab56e15c354945d8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Oct 2013 14:24:10 +0800
Tag:    v2.5.3

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

commit 85cb1bc059f7c4f90137a89ffe31bbece9a4f2ee
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Oct 2013 12:11:47 +0800
Tag:    v2.5.3

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

commit e13f7b4ed42ef4a28cf73bb81dc8ae284973c608
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Oct 2013 12:08:10 +0800
Tag:    v2.5.3

Merge branch 'MDL-42167-workshop-update-record_25' of git://github.com/mudrd8mz/moodle into MOODLE_25_STABLE

commit 26f1ad0c090dca8632a3ce91541a1ce4e123662c
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 10 Oct 2013 10:32:04 +0800
Tag:    v2.5.3

Merge branch 'MDL-41379_outcomes_25' of https://github.com/andyjdavis/moodle into MOODLE_25_STABLE

commit 72c707f101a05b03341d873de72ce87dcb58fca5
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Oct 2013 18:19:58 +0800
Tag:    v2.5.3

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

commit 7d3a6249a802d26e0b2eff2c70d40fbf92beeffd
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Oct 2013 16:54:17 +0800
Tag:    v2.5.3

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

commit 686abf0be9174bdf0b91612cb5e7a1b81059add5
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Oct 2013 16:48:11 +0800
Tag:    v2.5.3

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

commit fa4dda1dcbc3f4caf082811f8c6248d40daeba8d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Oct 2013 13:21:37 +0800
Tag:    v2.5.3

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

commit 5a12c4e258926992f975ae5a6be42806cb57476c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Oct 2013 11:33:45 +0800
Tag:    v2.5.3

Merge branch 'MDL-42013_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit 039b551f683afe80b4789ca530fef8da38d480a7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 14:31:51 +0800
Tag:    v2.5.3

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

commit e869047273a747548a1a11b6e34ee568d00a0bf5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 14:12:18 +0800
Tag:    v2.5.3

Merge branch '41189-25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE

commit 81a6ccf14a1082f61fab549ea72cc32229b31fc1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 12:05:02 +0800
Tag:    v2.5.3

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

commit 9778aa23330e4e0fc3f06a277f647c2a4d722174
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Sep 2013 18:04:39 +0800
Tag:    v2.5.3

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

commit 4d9ae8de1017f81a8cfe0c66e69ad909923c0b59
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Sep 2013 15:39:45 +0800
Tag:    v2.5.3

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