Git merges in Moodle 2.5.x by Dan Poltawski

commit 3ca102e45a37b68974400d0cb8b511f8aae077f7
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Mar 2014 14:18:25 +0800
Tag:    v2.5.5

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

commit 0634e5d5811bc2ff2bd3b1f63dd0dd8a3cc0cc8e
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Mar 2014 12:40:01 +0800
Tag:    v2.5.5

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

commit 12e33d79c07efb345a6fbb5fc6ebd4108cddde54
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Mar 2014 12:28:10 +0800
Tag:    v2.5.5

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

commit 27a3ba41d21e497889a13e8163348973fdc47184
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Mar 2014 11:29:25 +0800
Tag:    v2.5.5

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

commit b8cccad3232b2927fca7f72fffc4e293970215ed
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Mar 2014 10:52:50 +0800
Tag:    v2.5.5

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

commit 1533381d618863fa80adf1d93b1ce0b27d296f58
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Mar 2014 15:46:24 +0800
Tag:    v2.5.5

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

commit 3104f89ec8ecfefcdfa1b704e05f8d62fcafedc4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Mar 2014 14:41:31 +0800
Tag:    v2.5.5

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

commit cd0281f97e6dd3e8afeb58ced327228651c57717
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Mar 2014 12:56:15 +0800
Tag:    v2.5.5

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

commit 1249c069bbe78d793f42310148da889a01d22d51
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Mar 2014 15:15:23 +0800
Tag:    v2.5.5

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

commit ed28719f0327ebd61d725a60497ad04e24804177
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Mar 2014 10:07:21 +0800
Tag:    v2.5.5

Merge branch 'w06_MDL-43344_m25_flow' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 361604089e4ff22ca5deff18b14742788d3bdb51
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 25 Feb 2014 15:34:03 +0800
Tag:    v2.5.5

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

commit c1a7185e62a451c896aae0efac4142dba778ec0f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 25 Feb 2014 10:30:38 +0800
Tag:    v2.5.5

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

commit 4aceac629450914e6aea97cae24c43bf69ea3276
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 19 Feb 2014 09:16:51 +0800
Tag:    v2.5.5

Merge branch 'MDL-43182_25' of git://github.com/mr-russ/moodle into MOODLE_25_STABLE

commit 71ca9c1d48fbae864f3cd361547f41a8579542f9
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Feb 2014 14:14:02 +0800
Tag:    v2.5.5

Merge branch 'm25_MDL-43541' of git://github.com/danmarsden/moodle into MOODLE_25_STABLE

commit 13628d19a81e99a6722acba6ab7f09025f2ecfee
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Feb 2014 12:14:21 +0800
Tag:    v2.5.5

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

commit 392c6008733c5c42e8c192811f14c237dad85f65
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Feb 2014 12:06:46 +0800
Tag:    v2.5.5

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

commit a392332a28afb09776a34d5227eb9c6508bf0992
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Feb 2014 10:32:37 +0800
Tag:    v2.5.5

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

commit 5ac8f08a2db4f8fc57f8680bf36625562f131490
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 23:29:29 +0800
Tag:    v2.5.5

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

commit 5f69d9c594a98f63255e3d4cf9b573d026cbe864
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 15:21:20 +0800
Tag:    v2.5.5

Merge branch 'mdl34020-moodle25' of https://github.com/tlock/moodle into MOODLE_25_STABLE

commit 4bdaa6a78d82acd230cec23a9c641ef52f40c51d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 14:49:29 +0800
Tag:    v2.5.5

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

commit 7bf3f870f50a6c20a8ec29527c4ed471c8b45f46
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 11:21:56 +0800
Tag:    v2.5.5

Merge branch 'MDL-43693-MOODLE_25_STABLE' of https://github.com/lucisgit/moodle into MOODLE_25_STABLE

commit 785e7d36a7a063d21ca97835f7df68a5afe161db
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 15:29:23 +0800
Tag:    v2.5.5

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

commit d85aad0a18de97eb1cee2ad2aaab1db01b4e1b83
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 15:26:43 +0800
Tag:    v2.5.5

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

commit 1b87b7232e16d7573d568aeeae775d061451e013
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 14:24:41 +0800
Tag:    v2.5.5

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

commit be34306a6031711736805ccd782850bc2a8fc717
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 12:56:23 +0800
Tag:    v2.5.5

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

commit 4abee6b22583894e95437362c831a1a29ce990fc
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 10:53:51 +0800
Tag:    v2.5.5

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

commit 44e7dfe7a036c32b6dcfcc14ef43e5b2290a26c5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 10:33:39 +0800
Tag:    v2.5.5

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

commit c0486e9b91131b53a79e691ff9024fd8af960690
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 09:45:48 +0800
Tag:    v2.5.5

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

commit a0147ffa28fba2425b3db5270005ceb7e9ec871b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 09:26:22 +0800
Tag:    v2.5.5

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

commit 4703d6ba201ecc64163a1c0dd54451d0b6efbf83
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 15 Jan 2014 08:20:39 +0800
Tag:    v2.5.5

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

commit e2565b23b78e4236834810fea3a919e238b1e27e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 15:58:14 +0800
Tag:    v2.5.5

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

commit 155c7dfd1354b0c9a74ba7c7e199eaf28132fd6c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 15:48:53 +0800
Tag:    v2.5.5

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

commit 371714075266167ff8bb116f300f4c52ab0d2cac
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 15:37:01 +0800
Tag:    v2.5.5

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

commit 3f1b2de488fbef8c89d9990eb8c978997694e7ba
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 11:28:46 +0800
Tag:    v2.5.5

Merge branch 'm25_MDL-42792' of git://github.com/danmarsden/moodle into MOODLE_25_STABLE

commit 6462a6308b38688d852e2bd814c1fde797675f87
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 10:46:36 +0800
Tag:    v2.5.5

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

commit 3c1c78cef2c7c62975b2ae4339651c0de11c49cc
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 15:50:48 +0800
Tag:    v2.5.5

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

commit 6584492f0784a1af3de2028df89cbdb15c0b47b0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 12:35:04 +0800
Tag:    v2.5.5

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

commit 6fb9497847a1a434040912c0416f3d8652ed8c16
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 11:12:06 +0800
Tag:    v2.5.5

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

commit 36785d10dea720e61bd49ec0766ecdc26039166e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 11:03:39 +0800
Tag:    v2.5.5

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

commit 9a443297f7515d3467b2f81510ece8a5533c0d08
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 10:07:56 +0800
Tag:    v2.5.5

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

commit ac76e9b79758c3dfa2e0788d18a0f2296fc0f591
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 10:03:16 +0800
Tag:    v2.5.5

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

commit 0dc14c0b5685dd7a5cf64a0de4df780e96abc80c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 09:36:35 +0800
Tag:    v2.5.5

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

commit 60a188b9f365cd23124e6d6ef0643af53278d0a5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 08:54:26 +0800
Tag:    v2.5.5

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

commit 73a17686b77a2d449629fe2d96bba38268e7d474
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Jan 2014 17:20:51 +0800
Tag:    v2.5.4

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

commit b232a25269ac1129e2dfd15c9ed7b5a64fd444ba
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Jan 2014 12:43:32 +0800
Tag:    v2.5.4

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

commit 16c17a36c54f2474de80abe2e3b50bcf1960b02e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Jan 2014 11:51:23 +0800
Tag:    v2.5.4

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

commit 7023778c66a109e21eb82dd7c086088fc92fc8d1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Jan 2014 11:00:14 +0800
Tag:    v2.5.4

Merge branch 'MDL-43394a-25' of https://github.com/srynot4sale/moodle into MOODLE_25_STABLE

commit d71dd15415fae130405555930d312cd910a7ebf1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Jan 2014 14:21:49 +0800
Tag:    v2.5.4

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

commit 740981c93f99a36e0e4afbdafb73cd9d4a7d5182
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 18 Dec 2013 15:00:01 +0800
Tag:    v2.5.4

Merge branch 'MDL-41198-25' of https://github.com/mr-russ/moodle into MOODLE_25_STABLE

commit b35bc421f25dc32b3bb68372d82de9326ceeedef
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 05 Dec 2013 15:10:04 +0800
Tag:    v2.5.4

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

commit 6d8f88fb447797fcbc424134e67cbce0cc21ad33
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 05 Dec 2013 09:34:02 +0800
Tag:    v2.5.4

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

commit f1c88bc16cdddbfa1437ce11181b720f76612596
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 04 Dec 2013 15:44:14 +0800
Tag:    v2.5.4

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

commit 6fa2d2c2e18727b9333285a3c289218b5d3cf2f1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Dec 2013 16:08:25 +0800
Tag:    v2.5.4

Merge branch 'moodle25-mdl43020' of https://github.com/tlock/moodle into MOODLE_25_STABLE

commit 8708b9b3e2a2839309d21c8c2a15bc228597724f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Dec 2013 12:36:56 +0800
Tag:    v2.5.4

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

commit 6dd2511d2fafe9ed1a53e61e76861ab71dcc8b3c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Dec 2013 11:19:47 +0800
Tag:    v2.5.4

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

commit f683548a7836865a7d7cc4703c331801587a4f61
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Dec 2013 11:11:10 +0800
Tag:    v2.5.4

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

commit 2b1812189556588a3733d1deca83229c39dd3703
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 29 Nov 2013 12:52:47 +0800
Tag:    v2.5.4

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

commit 76c4158fa7934f78610ca7d449cb7b95bcf20374
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 27 Nov 2013 11:39:07 +0800
Tag:    v2.5.4

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

commit 8e999b264357e1d6f61d2a2e582092c0d6049c45
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 26 Nov 2013 15:06:32 +0800
Tag:    v2.5.4

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

commit ff68fc5dbd118ebd72015ad392e68f57079b22cc
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 26 Nov 2013 14:57:17 +0800
Tag:    v2.5.4

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

commit 768aa4ac334786455e5501b30907ebbade4ace96
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 26 Nov 2013 13:24:45 +0800
Tag:    v2.5.4

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

commit ed66d9399adece22845758f57599302ff63a4661
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 26 Nov 2013 12:12:49 +0800
Tag:    v2.5.4

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

commit 2f3a0c3d939daf0f1b896bf7ea68075ba3dcba23
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 26 Nov 2013 10:25:03 +0800
Tag:    v2.5.4

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

commit 05b233d112fb75723e6096768f683379f2aee895
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Nov 2013 13:40:58 +0800
Tag:    v2.5.4

Merge branch 'w48_MDL-37016_m25_sloppymysql' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit beb6b442ca7abd9138e0b755c63292c2f0b663d1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Nov 2013 10:37:38 +0800
Tag:    v2.5.4

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

commit 36bb3af6654babfc622b66c9a937f2572bb9e084
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Nov 2013 10:39:34 +0800
Tag:    v2.5.4

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

commit b4275e41ec98009a3c701a5819461f37980d3a38
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Nov 2013 10:31:51 +0800
Tag:    v2.5.4

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

commit e1d80827924007c85e3a49a1a07bb97f8df3478d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Nov 2013 10:07:06 +0800
Tag:    v2.5.4

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

commit 1157cc97981be455c82ec68750badb6fed117f5e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Nov 2013 15:39:18 +0800
Tag:    v2.5.4

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

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

commit 2d269d8a4f7f77bd22309154980948510e9e7086
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 05 Sep 2013 14:43:20 +0800
Tag:    v2.5.2

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

commit f5fc0223109a978eebda1823f74ff786700ec2cc
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 04 Sep 2013 10:38:19 +0800
Tag:    v2.5.2

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

commit a60215797d47fb510c9e922d3aa0d6c43513b8e3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Sep 2013 12:58:52 +0800
Tag:    v2.5.2

Merge branch 'w36_MDL-41255_m25_changepw' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 5202933cddd846fee0a8bbe3b2b859a2d0191ee3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Sep 2013 12:28:20 +0800
Tag:    v2.5.2

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

commit 3e07519d3f79928ed50d7a3dd58b9abdf7ea65dd
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Sep 2013 11:48:58 +0800
Tag:    v2.5.2

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

commit fb7bb9af1628d4eea789d87ebc46919254cb34eb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Sep 2013 10:40:34 +0800
Tag:    v2.5.2

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

commit 0522e090fbd48184d953361e37e951e395c719f7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Sep 2013 10:06:48 +0800
Tag:    v2.5.2

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

commit 5e86f2ea868bf224faf6c77d2975d99ed2821110
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Sep 2013 17:25:38 +0800
Tag:    v2.5.2

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

commit 37d1f21b36d6350063307e3de8d00882a761d28a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Sep 2013 15:24:23 +0800
Tag:    v2.5.2

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

commit 0ab8ba8bf94d74b1133afc2d6b840ab7441d4332
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Sep 2013 14:10:39 +0800
Tag:    v2.5.2

Merge branch 'MDL-36093-moodle25' of github.com:StudiUM/moodle into MOODLE_25_STABLE

commit 5218a6e8fb169878f3237e92a0deeb71d2427cfd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Sep 2013 11:52:21 +0800
Tag:    v2.5.2

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

commit 581a1695acd6ef39bf3100df253a4d387be943d6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Sep 2013 11:44:58 +0800
Tag:    v2.5.2

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

commit cb096cef51e922e9530d57ce5aa491f11d646eb5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Aug 2013 18:09:41 +0800
Tag:    v2.5.2

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

commit 44e1bb52ece8f13914d68efaa9e878e2a97e1355
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Aug 2013 14:08:14 +0800
Tag:    v2.5.2

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

commit 60426b9a2d79ff5e3554189a38a729b1371cad12
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Aug 2013 13:52:22 +0800
Tag:    v2.5.2

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

commit abfbffa640cf0bca794d579fb04f977a073b39e4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Aug 2013 11:03:48 +0800
Tag:    v2.5.2

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

commit 0846c3a54a9361d957529bf26d3c9b6700c286f9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Aug 2013 18:07:00 +0800
Tag:    v2.5.2

Merge branch 'MDL-41291-25' of git://github.com/mr-russ/moodle into MOODLE_25_STABLE

commit 9a29baa05ed8674924f6f77e0b98c8aafded5594
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Aug 2013 14:56:34 +0800
Tag:    v2.5.2

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

commit 7f3b8fa7b7a6922d1830acbeecb183e4e89935d3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Aug 2013 14:25:29 +0800
Tag:    v2.5.2

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

commit c9b822387bb478f91a7c22acd9081c9d942654ce
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Aug 2013 13:11:10 +0800
Tag:    v2.5.2

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

commit 6c98669c9bc70b901f4b229d0fd8828328bbac29
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 22 Aug 2013 11:18:01 +0800
Tag:    v2.5.2

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

commit c36c24ec26ebad33bff36a72dad2cc50ce5ff6af
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 22 Aug 2013 10:14:40 +0800
Tag:    v2.5.2

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

commit 2799d45f0867fcdd66b3a5a2e5bbb5cc3db76e65
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 22 Aug 2013 10:05:11 +0800
Tag:    v2.5.2

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

commit 94bcd74360132269e51461f07af6f8d3bae51452
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Aug 2013 15:17:52 +0800
Tag:    v2.5.2

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

commit e1435f9e6e6de912d58804e080691c0b3ba1423f
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Aug 2013 11:35:58 +0800
Tag:    v2.5.2

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

commit 69504a715482f65d8c1987fb4b2b38c7b41943ab
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Aug 2013 10:44:39 +0800
Tag:    v2.5.2

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

commit ba54a0b296bce0978ba2990fc3ed9f695fab4195
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 11:34:20 +0800
Tag:    v2.5.2

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

commit 23756ddfead89e19c9135d40a4c7fa048ad8b741
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 10:48:09 +0800
Tag:    v2.5.2

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

commit 31235acf2b38d7c25bdafabe3e361b14f545118b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Aug 2013 17:51:11 +0800
Tag:    v2.5.2

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

commit 2febf2022370e2422aa6b30ca64cc0e9a543494f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Aug 2013 14:50:10 +0800
Tag:    v2.5.2

Merge branch 'MDL-40893-25' of https://github.com/mr-russ/moodle into MOODLE_25_STABLE

commit b31d9b8cbd7806519fc2f3071d1d32e22424c348
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Aug 2013 12:57:50 +0800
Tag:    v2.5.2

Merge branch 'm25_MDL-37393' of github.com:danmarsden/moodle into MOODLE_25_STABLE

commit 2571672496158da5a3ce89dff04b0f7d83e8f25f
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 15 Aug 2013 16:41:41 +0800
Tag:    v2.5.2

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

commit 0d8d0a34e787349466c9b48b35c67e8cc8d814fd
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Aug 2013 21:57:43 +0800
Tag:    v2.5.2

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

commit 2d0f4897595cc4859fd735955f19fae412acafb5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Aug 2013 09:53:09 +0800
Tag:    v2.5.2

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

commit c6a8d2c08ca6fdb5b845111f6e13aed9a2c8f7e2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Aug 2013 16:41:59 +0800
Tag:    v2.5.2

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

commit 666d9bea6b76dcbf4352dd786a86a1b0265bf0d7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Aug 2013 16:13:20 +0800
Tag:    v2.5.2

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

commit ff8d9b59ef7d2748aeff643da0b443dc3b07d153
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 15:24:54 +0800
Tag:    v2.5.2

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

commit ae19a843bc709c00f4f10f307d4f2429053bdaf8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 13:56:46 +0800
Tag:    v2.5.2

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

commit c79efe260bc842aa8e1dd54ee3d66fceaade20e3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 13:30:35 +0800
Tag:    v2.5.2

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

commit 673a4563431760c3d170d35c685467c0a7d0a9c6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 13:21:12 +0800
Tag:    v2.5.2

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

commit 2018e8f12af4f97d884374701b8b9fbed10afcb7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 12:40:12 +0800
Tag:    v2.5.2

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

commit 3d4cb04ded4715a9384c85a9b6f49f7b2738a46b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 10:09:53 +0800
Tag:    v2.5.2

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

commit c38a4b6f04ea739a50038adaaab3ad994ee2e058
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Jul 2013 16:45:22 +0800
Tag:    v2.5.2

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

commit 4353b3d830e444f7c653383886164ef983be711d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Jul 2013 16:38:17 +0800
Tag:    v2.5.2

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

commit a8369f6a962621f3fe18f0423226f1727c2b9c0f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Jul 2013 13:34:29 +0800
Tag:    v2.5.2

Merge branch 'MDL-40585_25' of git://github.com/mr-russ/moodle into MOODLE_25_STABLE

commit fdcad4d5f3678808d653b223ba055fcf9c923fea
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Jul 2013 12:38:27 +0800
Tag:    v2.5.2

Merge branch 'MDL-40584_25' of https://github.com/mr-russ/moodle into MOODLE_25_STABLE

commit 1f506acf583ddf9a1daaefa99c9ebacbfae578bf
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Jul 2013 10:42:07 +0800
Tag:    v2.5.2

Merge branch 'MDL-40793_25' of https://github.com/mr-russ/moodle into MOODLE_25_STABLE

commit 6ca8973eca94fac993a1af0352bd8504984f99f2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Jul 2013 17:00:56 +0800
Tag:    v2.5.2

Merge branch 'w30_MDL-38867_m25_gspell' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 114b8bed28d0f43fa4de9f00ad943e52967f8855
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Jul 2013 15:02:21 +0800
Tag:    v2.5.2

Merge branch 'MDL-38837_25' of https://github.com/totara/openbadges into MOODLE_25_STABLE

commit 4896a0ba25833e1a82d3a67bb10ca04f04592595
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Jul 2013 10:46:47 +0800
Tag:    v2.5.2

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

commit d46d40d407bb338cebbff903b82ce332e802745b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Jul 2013 10:31:47 +0800
Tag:    v2.5.2

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

commit dee6316364013182b357925bafe7fc52034be27c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Jul 2013 15:53:06 +0800
Tag:    v2.5.1

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

commit f6b1260812bcf93e38a6cddddfd7565d37d08715
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Jul 2013 15:15:32 +0800
Tag:    v2.5.1

Merge branch 'MDL-40282.25' of github.com:colchambers/moodle into MOODLE_25_STABLE

commit a852df6f11d1f88e4820838ff23e81c083263fc8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Jul 2013 13:43:45 +0800
Tag:    v2.5.1

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

commit d7e626156e3ebadba71f493ae379ff936bbfaad0
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Jul 2013 13:33:59 +0800
Tag:    v2.5.1

Merge branch 'w27_MDL-40399_m25_msarrayshift' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 204383e50d310785d3601106c63ffb2dc7d675e4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Jul 2013 09:55:24 +0800
Tag:    v2.5.1

Merge branch 'w27_MDL-40266_m25_arrayshift' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 7698803c95838977e6defb033db5593ba94b6613
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 01 Jul 2013 11:22:05 +0800
Tag:    v2.5.1

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

commit 8e29fe2d72a095ef3a38d1e6fcdee622149c9fc3
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 21 Jun 2013 13:29:46 +0800
Tag:    v2.5.1

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

commit 160e432aee9cb09c076379d486d90bc214f78cb9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Jun 2013 16:41:15 +0800
Tag:    v2.5.1

Merge branch 'MDL-39825_master' of https://github.com/totara/openbadges into MOODLE_25_STABLE

commit e38c37939a556a5f6091121ddf31ef2f7de74a9d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Jun 2013 13:37:23 +0800
Tag:    v2.5.1

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

commit 6117c578e4c534de6316ff769a165270ab4c6827
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 12 Jun 2013 09:34:04 +0800
Tag:    v2.5.1

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

commit bacf4c5c713e69bbe8c7c844859dc75eddb0f8f5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Jun 2013 16:00:51 +0800
Tag:    v2.5.1

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

commit 43c5a7d5ad9b8b5803646b339eea1cf7aeee2f14
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Jun 2013 15:35:31 +0800
Tag:    v2.5.1

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

commit f60ad3fdff91f152447c8dfc19ff030eadd85e50
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Jun 2013 12:54:38 +0800
Tag:    v2.5.1

Merge branch 'm25_MDL-40002_ETag_value_must_be_a_quoted-string' of https://github.com/scara/moodle into MOODLE_25_STABLE

commit 96241e57e9fb5f50471e5b5d77dcf8f7abe2ecd1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 16:20:30 +0800
Tag:    v2.5.1

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

commit ade2afc29faa9c417cc233672262334a0eb2af58
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 16:07:28 +0800
Tag:    v2.5.1

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

commit 534f1476f409a07ce2c4ccebeadd5d29393156e7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 15:42:53 +0800
Tag:    v2.5.1

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

commit a327e8786658f9dde6f16df56a36bcd94eff2b3b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 15:00:20 +0800
Tag:    v2.5.1

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

commit 0f74c82897e29ea1c0637e36f50a94d7c5fc31ef
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 14:58:12 +0800
Tag:    v2.5.1

Merge branch 'MDL-40013_25stable' of git://github.com/oasychev/moodle into MOODLE_25_STABLE

commit 7f9f03442a2ace327340a058f456752246be9e66
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 13:12:16 +0800
Tag:    v2.5.1

Merge branch 'w24_MDL-39096_m25_obfuscate' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 9d1a909f0ece996502879b4162765efde168afe8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 12:17:04 +0800
Tag:    v2.5.1

Merge branch 'w24_MDL-28394_m25_enrolrestore' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit c9d1c4993db8f40aaf29f0ec78fb90b8c9c311c6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 12:09:59 +0800
Tag:    v2.5.1

Merge branch 'm25_MDL-37968' of git://github.com/danmarsden/moodle into MOODLE_25_STABLE

commit 6f4232974ed56fec5b6ecb7e7140c4c598d6d133
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 10:54:27 +0800
Tag:    v2.5.1

Merge branch 'wip-MDL-39824-m25' of http://github.com/samhemelryk/moodle into MOODLE_25_STABLE

commit 1c437c97f77ef76708195655ec62673e06fd3ab6
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 06 Jun 2013 11:55:07 +0800
Tag:    v2.5.1

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

commit e0e6015416487391c8ac3c4d4e8aaff6662ec3ce
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Jun 2013 13:10:18 +0800
Tag:    v2.5.1

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

commit bf2360c59733025daab84ad762494160ec4d27fe
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 15:54:01 +0800
Tag:    v2.5.1

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

commit e7bb4b1ee79931be70c1dcee6646ceff0a223956
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 14:43:13 +0800
Tag:    v2.5.1

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

commit 2b7e18fdedae14a01ef6ba89af40af4a6d3558c7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 14:38:36 +0800
Tag:    v2.5.1

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

commit 2fdfdd49d442b8f8e59c1eefbc52afa2cc48a82d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 13:32:33 +0800
Tag:    v2.5.1

Merge branch 'MDL-39931-M25' of github.com:lazydaisy/moodle into MOODLE_25_STABLE

commit cb1318754e034f7a00b1a81f6e1f91e9f2a7bedb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 13:19:16 +0800
Tag:    v2.5.1

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

commit 2140e5afa40219bb8dc23edf3cf57db7a5c1d4d5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 11:29:57 +0800
Tag:    v2.5.1

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

commit acae4313c8e0bdcc10e04279b23f10af4eff3c8e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 11:26:33 +0800
Tag:    v2.5.1

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

commit e19a07bfcb807ea7e64a6f064b5809134e1f3111
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 11:03:45 +0800
Tag:    v2.5.1

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

commit c687e8d741b18a9ed5bcc36aa5b0b68ce64a2805
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 10:42:55 +0800
Tag:    v2.5.1

Merge branch 'wip_25_mdl-34085' of https://github.com/iarenaza/moodle into MOODLE_25_STABLE

commit 8d94299b02264f4a1d209cdcea33103ef9b9ca4a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 27 May 2013 14:36:55 +0800
Tag:    v2.5.1

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

commit 121e2492e80046102ed68ebc884cd5e5e4bf12ef
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 27 May 2013 14:13:36 +0800
Tag:    v2.5.1

Merge branch 'MDL-38239-moodle25' of git://github.com/StudiUM/moodle into MOODLE_25_STABLE

commit 6c16494f030a35a929de634e910f3fa85955be43
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 27 May 2013 13:43:37 +0800
Tag:    v2.5.1

Merge branch 'w22_MDL-39688_m25_etag' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 191e70c2e2b71830030d3695318b4d5dc71620d8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 27 May 2013 13:05:14 +0800
Tag:    v2.5.1

Merge branch 'w22_MDL-38408_m25_paypalcost' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit ceb4030763257d4eb323cd1b6d899ee319e15515
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 27 May 2013 10:18:32 +0800
Tag:    v2.5.1

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

commit b051261ecc39e09cfc47d4afec0314f791522ca7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 May 2013 11:00:32 +0800
Tag:    v2.5.1

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

commit e90eb091c519fc37da8c5337e47c080fc5468c33
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 May 2013 17:58:29 +0800
Tag:    v2.5.1

Merge branch 'w18_MDL-39374_m25_folderlog' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 2a7a5cfa4c9146d03e6a27e0b20d266c01b18f9c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 May 2013 20:51:12 +0800
Tag:    v2.5.0

Merge branch 'MDL-39599-master-int' of git://github.com/FMCorz/moodle

commit 3f461e9322de2192c7d818dcb34626a5c4cb65ac
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 May 2013 20:09:14 +0800
Tag:    v2.5.0

Merge branch 'MDL-39579-master-int' of git://github.com/FMCorz/moodle

commit 0249631131caadec5a6c0ee57f6dcb52fe4278be
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 08 May 2013 20:27:42 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38979-master' of git://github.com/ds125v/moodle

commit ae3507af096b59d9bfbc2993547631c7af075432
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 08 May 2013 20:03:58 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39552' of git://github.com/stronk7/moodle

commit 2022330dd795a4bf8f4891ce99a097aebd070eaf
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 08 May 2013 19:37:18 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39545_master' of https://github.com/markn86/moodle

commit ca463dcf1c6bd84b53723ec2a77ced3c465fbc06
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 08 May 2013 19:33:19 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-39520-master' of git://github.com/marinaglancy/moodle

commit 1d8288f242e1e0cb2e7c356f686880c787c97e48
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 08 May 2013 16:21:42 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-39462-master' of git://github.com/marinaglancy/moodle

commit 5179b61259e5a833e6173c2be9289b49a3c610a6
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 08 May 2013 16:10:55 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39542-master-int' of git://github.com/FMCorz/moodle

commit 49bd43c140316336bfb5d2b664e18af59096abdc
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 May 2013 23:42:19 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39497-workshop-allocator-stable' of git://github.com/mudrd8mz/moodle

commit d04782883597b9dbc88aeb174cdafaf623737474
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 May 2013 23:33:06 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39515-master' of git://github.com/barbararamiro/moodle

commit 339386d96c2b515098fdb2b7db7f36b38c835cb1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 May 2013 23:32:29 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39514-master' of git://github.com/barbararamiro/moodle

commit b6009c5ca573122fa29dd0386baf627ab4dcc3dd
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 May 2013 22:28:05 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-36223-master' of git://github.com/damyon/moodle

commit 38a6ec6a3a9acda58097fec56a887c1523eaf2cc
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 May 2013 22:12:58 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-39436-master' of git://github.com/marinaglancy/moodle

commit 5bb85e4bf6db9ae90b3e96add137418d6dd61a5e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 May 2013 21:42:44 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39508_master' of git://github.com/lazydaisy/moodle

commit 577f21ec243388dcc451214977e8dc33ef466b16
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 May 2013 19:15:38 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39496-m' of git://github.com/andrewnicols/moodle

commit 1795fc7eadd74be7d96423be3f8d79aa3f876c6a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 May 2013 18:54:15 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38500-master' of git://github.com/FMCorz/moodle

commit ac15fc95fa9d18dc9cb59cce31ddfc3fb9e892aa
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 May 2013 18:43:23 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39448-master' of git://github.com/sammarshallou/moodle

commit bdc892833977781d78fdde1050ad8cfc8cdc3901
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 May 2013 18:41:30 +0800
Tag:    v2.5.0-rc1

Merge branch 'master_MDL-35852' of git://github.com/danmarsden/moodle

commit 8a414a7950215e9a7c734e275ac37a83b81e03aa
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 May 2013 23:12:28 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39435-master-int' of git://github.com/FMCorz/moodle

commit 90f44f5cd32c961038d1213e3046ed30653e58aa
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 May 2013 23:04:45 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38238-master' of git://github.com/barbararamiro/moodle

commit c8922056173dc8c677b19edbd7dc53cec037f1c2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 May 2013 21:47:58 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39446' of git://github.com/timhunt/moodle

commit 2da94da7b54fac34c84e0d2fad800c7908891763
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 May 2013 21:32:33 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39473-master' of git://github.com/sammarshallou/moodle

commit cbd77ed9bb6410fbf3e16082202ebc65a1756f97
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 May 2013 20:25:51 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-39065-master' of git://github.com/marinaglancy/moodle

commit b92830664df9195f2fb2b4f7d46802eec166a449
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 May 2013 20:11:46 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39491-workshop-media' of git://github.com/mudrd8mz/moodle

commit 845fccfcb66e64f1dcbd6d69dbfbaa5613bfe18c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 May 2013 19:39:53 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39470_master' of https://github.com/markn86/moodle

commit 473623695948e041135e93b0205a22eb325c45a9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 May 2013 17:00:23 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39442-copy-addon' of git://github.com/mudrd8mz/moodle

commit 8f9ae1d5e8cdd7e258b7997ec8a893eba34c606e
Author: Dan Poltawski <dan@moodle.com>
Date:   Sun, 05 May 2013 18:29:11 +0800
Tag:    v2.5.0-rc1

Merge branch 'brokencalc' of git://github.com/andyjdavis/moodle

commit 1fc7079857140a51da7f51974c98350ead759082
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 03 May 2013 23:05:41 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39476-master' of git://github.com/damyon/moodle

commit b741e1c18631ad78ddfd610ebe9d2b0603a6fbd1
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 02 May 2013 21:32:03 +0800
Tag:    v2.5.0-rc1

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit d773056669728776e08ea77122cadfb723d3aba4
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 02 May 2013 00:32:09 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39367-master-int' of git://github.com/FMCorz/moodle

commit 5f5843f84bf46b4c29464774c79ec9a75e23b5d3
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 01 May 2013 16:53:18 +0800
Tag:    v2.5.0-rc1

Merge branch 'w17_MDL-39402_m25_themedep' of git://github.com/skodak/moodle

commit 142fa8c75d7fef49daa0e76e4e6b406fdaa7de72
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 01 May 2013 15:32:30 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39438_master' of git://github.com/dmonllao/moodle

commit fb92d5ef57e14b8e0181209371f61db6a4a290ab
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Apr 2013 23:13:48 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39270-master-int' of git://github.com/FMCorz/moodle

commit 21a6714fc924d9816473bf076d7820dbdec59f99
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Apr 2013 22:49:41 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39265-master-int' of git://github.com/FMCorz/moodle

commit 1af49024a5684fc184e75215d87ea0c8a7a23414
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Apr 2013 21:42:44 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39207_master' of git://github.com/totara/openbadges

commit 2e521b3d560b6382b5d0dc69b5f23a685383624e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Apr 2013 21:35:28 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39368-master-int' of git://github.com/FMCorz/moodle

commit 24fa63f415acc4ae20a7580cc505942f79311217
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Apr 2013 21:11:34 +0800
Tag:    v2.5.0-rc1

Merge branch 'w17_MDL-39343_m25_installupgrade' of git://github.com/skodak/moodle

commit 4410509d0b3d424ad2f1db18588f78e4d3b50535
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Apr 2013 21:07:55 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-35385_chat' of git://github.com/andyjdavis/moodle

commit 0542fdc6b4749de3ca378af64d338f188060e61d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Apr 2013 20:37:52 +0800
Tag:    v2.5.0-rc1

Merge branch 'w17_MDL-39343_m25_installupgrade' of git://github.com/skodak/moodle

commit 8926c9fbcd63b737cc5d3a3adea271c43cf430d1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Apr 2013 16:57:29 +0800
Tag:    v2.5.0-rc1

Merge branch 'w17_MDL-39402_m25_themedep' of git://github.com/skodak/moodle

commit f8a14f7bccb7758d53efee441dfb4c3b4a96bcac
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Apr 2013 16:16:31 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39405-master-int' of git://github.com/FMCorz/moodle

commit 0174ada56cc097e652a5afbc77863318bdf9973c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Apr 2013 15:52:49 +0800
Tag:    v2.5.0-rc1

Merge branch 'w17_MDL-39292_m25_enrolicons' of git://github.com/skodak/moodle

commit 7a286a0d6d49fc5eb641108ba0902307f648b214
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Apr 2013 15:34:16 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39415-master' of git://github.com/damyon/moodle

commit e0b3f5f235859a663f54526818ae29d576f3cc04
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Apr 2013 15:24:31 +0800
Tag:    v2.5.0-rc1

Merge branch 'w17_MDL-39077_m25_sizes' of git://github.com/skodak/moodle

commit a10393e19f567cf5f4b2365f43cae910a647873e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Apr 2013 00:00:53 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39378' of git://github.com/timhunt/moodle

commit 4eaa3532451cb1935211ffdca4a0e97088e51abf
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Apr 2013 21:20:39 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39158-master' of git://github.com/damyon/moodle

commit e947caf4a199d1e06828a1e73d5583aa4d136c18
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Apr 2013 21:15:23 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39389' of git://github.com/stronk7/moodle

commit 1f65889ab3c2162ef24e4844a15678982de26f84
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Apr 2013 21:12:37 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39390' of git://github.com/stronk7/moodle

commit fcb6d4aac8adada3f7a9a0b3453b25753c453c6c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Apr 2013 17:27:29 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-27071' of git://github.com/stronk7/moodle

commit bd7ed905d5b19c86847326308e34183da2144f45
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 26 Apr 2013 17:37:15 +0800
Tag:    v2.5.0-rc1

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit 5df8fc67440f82284c0d7d4e2d0eaf115a6165ac
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 26 Apr 2013 16:52:44 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39341-master' of git://github.com/damyon/moodle

commit 75358cf3c58ba76b7df2d98fc47a108159199807
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 25 Apr 2013 21:53:18 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-39305-master' of git://github.com/marinaglancy/moodle

commit 6cb94fd13b1fbbca1b1c5f91178b0283b0aea849
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 25 Apr 2013 20:06:52 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38889-master' of git://github.com/mouneyrac/moodle

commit 68265ee2d61e518bcbb8f723e03ab71b5cf0e018
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 25 Apr 2013 19:49:38 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-34403' of https://github.com/mpetrowi/moodle

commit 78129ff0be523f6de617f7a7e7dcc9769ede66fa
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 25 Apr 2013 17:19:45 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-29258_master' of git://github.com/dmonllao/moodle

commit 0722742b63274d9cb703546fec72624338eaa3d4
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 25 Apr 2013 17:09:52 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39329-master' of git://github.com/FMCorz/moodle

commit ba26ed9cac55721ea1fe338ec417f8955fc029fa
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 24 Apr 2013 21:33:00 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39283' of git://github.com/jmvedrine/moodle

commit 088c2616ec8be81257dc02ff509a927065a4d661
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 24 Apr 2013 18:47:08 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-39297-master' of git://github.com/marinaglancy/moodle

commit a461c6d444206fa5e02a1a3c8dd332df7a28afb6
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 24 Apr 2013 18:39:08 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38415-master' of git://github.com/FMCorz/moodle

commit 6f0fdc9bb29f3e41d1ccfe28f42906bb0151a21e
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 24 Apr 2013 16:57:22 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38597-master-int' of git://github.com/FMCorz/moodle

commit c1ae8606bde44250179240107eb5e927f97f76c6
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 24 Apr 2013 16:53:25 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38572-master' of git://github.com/FMCorz/moodle

commit 9da8c532957f5427be5c909604701af8d4cd1d2f
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 24 Apr 2013 16:08:23 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39219_scorm_ie7' of git://github.com/davosmith/moodle

commit e6c91f99ec62f8f4abb401da3e77729633b59364
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 24 Apr 2013 15:16:37 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38892' of git://github.com/rwijaya/moodle

commit 89275dcf80412a05aacd066538f67bc3ccc4bb96
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Apr 2013 20:00:30 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-37784' of git://github.com/jmvedrine/moodle

commit 88dbfc453e12ff3c9d67124ee2361659f2955ba7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Apr 2013 19:50:44 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39296-master' of git://github.com/ankitagarwal/moodle

commit fe5bb43ae558d9095f00685e57dc71c3f9e2ae7d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Apr 2013 00:23:43 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39264-master-int' of git://github.com/FMCorz/moodle

commit c1e1c22fb590d7b25f36d3fb84218773aa046344
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Apr 2013 21:41:34 +0800
Tag:    v2.5.0-rc1

Merge branch 'w16_MDL-39213_m25_userupload' of git://github.com/skodak/moodle

commit 789ce8202b05c892a9449a61e2324b7d4bf29655
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Apr 2013 21:33:28 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39148-uninstall' of git://github.com/mudrd8mz/moodle

commit 9bc5a6b9d8bd9129dd9a62245967c0b11e99e4e9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Apr 2013 20:57:57 +0800
Tag:    v2.5.0-rc1

Merge branch 'w16_MDL-39178_m25_themesettings' of git://github.com/skodak/moodle

commit 816659ed9e2f8fd8229572f905fb64bc402ea7ae
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Apr 2013 20:12:48 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39249-upgrade-wizard' of git://github.com/mudrd8mz/moodle

commit 997f3022add7d18f18987cb1968dd65d085d2bfd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Apr 2013 20:07:45 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39248-plugins-check' of git://github.com/mudrd8mz/moodle

commit e65dfc0275ff1354a096cc9eff7868362bc6b61f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Apr 2013 20:05:53 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39186' of git://github.com/timhunt/moodle

commit 8c82b67ef0069d04a22ea9b9d037f5923eb2ca35
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Apr 2013 19:47:10 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38603-workshop-form' of git://github.com/mudrd8mz/moodle

commit e39ef3d124558aabb8d8b859438307c731e6ab1c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Apr 2013 19:42:10 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-37942-master' of git://github.com/jason-platts/moodle

commit 4bb3f29e0271c968677d1100719aac51dd0ed8d1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Apr 2013 19:38:47 +0800
Tag:    v2.5.0-rc1

Merge branch 'w16_MDL-39141_m25_toolbar' of git://github.com/skodak/moodle

commit 3a3621821a53795ec8fdf31b782cedb025a4d997
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Apr 2013 18:41:41 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39173-master' of git://github.com/damyon/moodle

commit b93945e9b94f2827100c672e14863562d6329ca3
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 19 Apr 2013 22:20:02 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39219_scorm_ie7' of git://github.com/davosmith/moodle

commit aa15c5f3fff0f6de3d52ac2226c7cb5904ad77ce
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 19 Apr 2013 22:11:33 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38361' of https://github.com/prateeksachan/moodle

commit 00a850b33e9b9d083995820a4f4f6549243fb815
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 19 Apr 2013 20:29:07 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-38565-m25' of git://github.com/samhemelryk/moodle

commit 8a4f888220d5d0587ddfdd0e4db620102bb85757
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 18 Apr 2013 19:41:24 +0800
Tag:    v2.5.0-rc1

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit 5ca1899e6edf6e8a836c44f3b70ae78ac24cf205
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 18 Apr 2013 15:50:29 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39203-master' of git://github.com/FMCorz/moodle

commit 500f9a4c9da7e80cf1232b761161aa9bd65438d5
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 17 Apr 2013 19:48:17 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-mdl-39110' of git://github.com/rajeshtaneja/moodle

commit 51850ccaf8c15ad83b0d9ddbe90984b790cdee6a
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 17 Apr 2013 19:37:23 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38573-master-int' of git://github.com/FMCorz/moodle

commit 0107a90fe80f885d756ea0e87afc09451a406cd8
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 17 Apr 2013 19:32:39 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39081' of git://github.com/rwijaya/moodle

commit c6101ef441c8d35e3412b3be5a30230902db09b3
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 17 Apr 2013 19:09:20 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39087-plugins-uninstall' of git://github.com/mudrd8mz/moodle

commit b90bd21c5f3ea7cbf36ee17b49eef1519b1c899e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Apr 2013 21:47:14 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-27814-master' of git://github.com/ankitagarwal/moodle

commit dfd24d622f6a2a9ea84bc84809e00d8efb76b3f2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Apr 2013 20:46:51 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39140_m25' of git://github.com/sbourget/moodle

commit bc02f33809fb2245d179957828642dd6e7d77374
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Apr 2013 20:42:01 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-mdl-39116' of git://github.com/rajeshtaneja/moodle

commit 342b1901ac419380ae09c219b10b6744c2d180b5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Apr 2013 20:30:10 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39029' of git://github.com/jacks92/moodle

commit f7f1465f9130208b2c18d4ee5ec7c1479209a31f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Apr 2013 20:26:34 +0800
Tag:    v2.5.0-rc1

Merge branch 'm25_MDL-38678_SCORM_RTE_not_required_for_SCO_Assets' of https://github.com/scara/moodle

commit 05e1747dfe4d7f6243b2a7f35f50fbbd42ed6607
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Apr 2013 19:44:42 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39080_master' of git://github.com/kordan/moodle

commit 19226a309ff4c71b872aab151fc58499dde4eb8f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Apr 2013 19:00:46 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39063' of github.com:totara/openbadges

commit 9aae7551ecc9832b002db8dad7b6a00a9b3ee0cc
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Apr 2013 23:25:06 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38880' of git://github.com/jmvedrine/moodle

commit 34ddaf7146f538c80bd6f4066b43886e1bba813a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Apr 2013 19:15:24 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39047_master' of https://github.com/markn86/moodle

commit 7e155b96fb2053f999602d44eaa404221ca1c11d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Apr 2013 17:24:20 +0800
Tag:    v2.5.0-rc1

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

commit ed9a90c0184b7364baefac1d201f5fc79757570e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Apr 2013 16:05:25 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38980_master' of git://github.com/lazydaisy/moodle

commit 118f39de133800022ffceeeedf5d8efb2bb959d7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Apr 2013 15:58:30 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39010_master' of git://github.com/lazydaisy/moodle

commit a7eac88f9454259169ad212b976b361d72d639e2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Apr 2013 15:29:56 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39000-master' of git://github.com/sammarshallou/moodle

commit 3cdea44a87756f8b7fb1557bac9bcafb81b73aaa
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Apr 2013 14:58:53 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38011' of git://github.com/srynot4sale/moodle

commit 5795bc60c9109ab2c9a9b78e38ba794192be64d1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Apr 2013 14:35:14 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38716-master-int' of git://github.com/FMCorz/moodle

commit 47df95c362f17e6518cd9385c6b32ba1051c5167
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 12 Apr 2013 11:08:28 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39054' of git://github.com/jacks92/moodle

commit f4f0a085d8fdc7fd6a00c77e98813dcbe61d2cdd
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 12 Apr 2013 10:45:00 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39011_master' of github.com:totara/openbadges

commit f4686f5df923b23e9ba89fc3cde5d692cc584d08
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 12 Apr 2013 10:30:10 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39049_master' of github.com:totara/openbadges

commit e8c7506a455e3a998c7fdaa023bb5b37254d0e47
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 12 Apr 2013 10:26:05 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-37537' of git://github.com/srynot4sale/moodle

commit 481c1c363a22d27600c29d6f4a9f5f2835ff7ffd
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 12 Apr 2013 10:08:45 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38637-master' of github.com:StudiUM/moodle

commit 315e2ad13343208c5c6782b99d261813dbd5ad1d
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 12 Apr 2013 09:59:49 +0800
Tag:    v2.5.0-rc1

Merge branch 'integration_MDL-38997' of github.com:totara/moodle

commit 3ee53622bf255c217f435543860e9a1801205363
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 11 Apr 2013 10:19:10 +0800
Tag:    v2.5.0-rc1

Merge branch 'm25_MDL-39061_Trivial_incorrect_MD' of https://github.com/scara/moodle

commit a4b524e9313909e558c47c8d6e611cb381f10f7d
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 10 Apr 2013 14:48:49 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38973-master' of https://github.com/damyon/moodle

commit 95cd4369bbbca61ae7345a717fbc6d7733617540
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 10 Apr 2013 14:10:37 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-19072' of git://github.com/jmvedrine/moodle

commit d2b11df8bd2ecad0ad7000631e5e648c4515563d
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 10 Apr 2013 12:16:23 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-mdl-35883' of git://github.com/rajeshtaneja/moodle

commit e870c160771f60f92c1a0471d28225baa08b8bd9
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 10 Apr 2013 12:08:46 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38254' of git://github.com/rwijaya/moodle

commit aefd2e5d35a76acfd543cfa24bcaccb5160eebc0
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 10 Apr 2013 11:57:49 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39041-master' of git://github.com/damyon/moodle

commit ac208538b7b9f592a9aa36e6f0bc813d1d31853a
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 10 Apr 2013 11:11:47 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38030-master' of git://github.com/mouneyrac/moodle

commit 7f2ac368e8f30cf693276385935cc300a1d18135
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 10 Apr 2013 11:09:05 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38933-master' of git://github.com/damyon/moodle

commit bf11c1d128d447ae3ab94d98517150da8e6fa7ee
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 10 Apr 2013 10:58:32 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-22153' of git://github.com/stronk7/moodle

commit cfaacebb010cafe89956262463773e5543707cc3
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 10 Apr 2013 10:55:45 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39059-workshop-settype' of git://github.com/mudrd8mz/moodle

commit fbd90ba19160522ffa32e8653c1db746f665c770
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 10 Apr 2013 10:37:29 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-37410-master' of git://github.com/mouneyrac/moodle

commit 0bedc806f960e9f8a1b7e2c369f8688e62257843
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 10 Apr 2013 10:35:40 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38999' of git://github.com/stronk7/moodle

commit ca0b1f57fcc38e8b0127da497181c5d3f1af4e17
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Apr 2013 15:39:57 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-38442-m25' of git://github.com/samhemelryk/moodle

commit ad84f8f9acb3ab54dfd307d4454b1d4e5e16d72d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Apr 2013 14:58:47 +0800
Tag:    v2.5.0-rc1

Merge branch 'w14_MDL-38927_m25_rolelocalisation' of git://github.com/skodak/moodle

commit 0ae1b8a294eb4ffd470d8d99ce9cfcf0b76ffc85
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Apr 2013 14:57:08 +0800
Tag:    v2.5.0-rc1

Merge branch 'w14_MDL-39004_m25_roledocs' of git://github.com/skodak/moodle

commit 33815b4b7e1ec189b81d8b2f4d05b4d021dd1d09
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Apr 2013 14:49:07 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-38682-master' of git://github.com/marinaglancy/moodle

commit 5331215459fa485d1ce786736283fafe0c77c4d7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Apr 2013 13:49:09 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39005' of git://github.com/stronk7/moodle

commit 224db0e83b0c8e1f4cdfc75f27dcb36d6d2fcdab
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Apr 2013 13:19:10 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38981' of git://github.com/jmvedrine/moodle

commit c64d2c0acd73c7eb3e35e3e5009bf8c66d861970
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Apr 2013 13:09:57 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-34346-master' of git://github.com/marinaglancy/moodle

commit 69203ea923c12f2f21854601faa109f40f0f2480
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Apr 2013 11:49:55 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-38682-master' of git://github.com/marinaglancy/moodle

commit e26b02ddad8af457ad6d1933371f79c3dcc5b3aa
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Apr 2013 11:46:27 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-38593-master' of git://github.com/marinaglancy/moodle

commit a676e858f9b1e9b5a1a9a37fbcbc7481bb0e2868
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Apr 2013 10:57:50 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-34346-master' of git://github.com/marinaglancy/moodle

commit fadec475d4def9d00efef0d9e674e9d9326de8cc
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Apr 2013 10:37:23 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38766/master' of github.com:kemitix/moodle

commit b11c74f492ecb32b1fda140998141ee0ada1e08c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Apr 2013 09:47:47 +0800
Tag:    v2.5.0-rc1

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

commit 91a3c9ba9f0366dff408d1e34e28ffd025abbbb6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Apr 2013 15:36:07 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38179_master' of git://github.com/dmonllao/moodle

commit 0fc2ab80475ada7f31bc384bf181bfc8237fdb4c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Apr 2013 14:05:21 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-37676' of git://github.com/appalachianstate/moodle

commit bf48be3c7cf4dd660a1aaf6896552372a5ce4eb3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Apr 2013 11:55:55 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38634' of git://github.com/rlorenzo/moodle

commit b23fcda2b9ac2f8943edd833ff20d312fd9de052
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Apr 2013 11:14:03 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39006' of git://github.com/stronk7/moodle

commit efc9febcd8080e2245fdc1b3ab39bee380357872
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Apr 2013 10:22:59 +0800
Tag:    v2.5.0-rc1

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

commit 203a2538d63cea5b92c9c4c59481e503a593ab8a
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 05 Apr 2013 17:52:13 +0800
Tag:    v2.5.0-beta

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit 8b8641876bade13e19b2d88e9267e00f2e612c41
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 05 Apr 2013 16:43:43 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36804-fix3' of git://github.com/damyon/moodle

commit 31f2822a5ea717ba31ea8a10fe50fae9a6f3fdfb
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 05 Apr 2013 16:00:35 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36804-master-fix2' of git://github.com/damyon/moodle

commit 589fe9c85d6bc531fef2e6d4dbc03ee53f6db1f1
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 04 Apr 2013 14:05:17 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38590_master-fix-behat' of git://github.com/dmonllao/moodle

commit f88ff0e7cf7c4219ec356f66e7235b8ebdb183ef
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 04 Apr 2013 11:00:01 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38861' of git://github.com/stronk7/moodle

commit 626403eb73e03470b54319bc1d73ec0dd182e2c7
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 03 Apr 2013 20:22:03 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38538_clean' of git://github.com/timhunt/moodle

commit aed60c64afa8cd7d41695866174596bfb0c61b1e
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 03 Apr 2013 17:32:15 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36804-master' of git://github.com/damyon/moodle

commit 369496c31e248e208702fb2a4b421efdd1cc4b11
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 03 Apr 2013 17:22:38 +0800
Tag:    v2.5.0-beta

Merge branch 'm25_MDL-38678_SCORM_RTE_not_required_for_SCO_Assets' of https://github.com/scara/moodle

commit 41b9392daa26b06a5a6cba2d4b30a64f8dc2ad25
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 03 Apr 2013 16:50:43 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38657_master' of git://github.com/lazydaisy/moodle

commit 71573249ae428ef0d253db2170659ca667986815
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 03 Apr 2013 16:47:15 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36804-master' of git://github.com/damyon/moodle

commit 5cc929bc126af3dbe76decd9a95271687661f1a1
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 03 Apr 2013 16:27:16 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38691-master-int' of git://github.com/FMCorz/moodle

commit 5e45f6a569f7b4f3990973c663c5ea0423849ee1
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 03 Apr 2013 16:18:50 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36804-master' of git://github.com/damyon/moodle

commit 89ea5ecd4527c474131111b64805ba7a827be497
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 03 Apr 2013 15:39:48 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37602-workshop-overall-feedback' of git://github.com/mudrd8mz/moodle

commit 998c5996e0da14fa42ba356ad2204cad37d23b68
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 03 Apr 2013 14:46:58 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38808' of git://github.com/jmvedrine/moodle

commit dc4260d918a81b8e43f3743b4c42591f7dc2ac3a
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 03 Apr 2013 14:27:08 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38681-master-int' of git://github.com/FMCorz/moodle

commit ac8bc0f9474d0dc8b82fcd2e0c213c17ebb36f28
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 03 Apr 2013 13:57:02 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-34640' of git://github.com/timhunt/moodle

commit ba98c8ab543ea918b1790ca8d353de0139f952a0
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 03 Apr 2013 12:44:05 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38855_master' of git://github.com/dmonllao/moodle

commit f27be4c1aa36e7763a41ba09869f315f64da4910
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 03 Apr 2013 12:30:12 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37602-workshop-overall-feedback' of git://github.com/mudrd8mz/moodle

commit 6833c6d90159052d753135777c8771e975a04398
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 03 Apr 2013 11:28:49 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38509-tool-installaddon' of git://github.com/mudrd8mz/moodle

commit 0bcdbb7ff10988e2b1b22987b3cfb5e566b617df
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 03 Apr 2013 09:59:01 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38735' of git://github.com/stronk7/moodle

commit 89cc9816dce1b2af93cf35a6bbb2c7ede4da4699
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 03 Apr 2013 09:55:21 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38538_clean' of git://github.com/timhunt/moodle

commit 6842ab4455b437e7917c5a03f3ffc46b406c268e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Apr 2013 19:54:46 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38821_master' of git://github.com/dmonllao/moodle

commit 15c2b2c43a28c02cb833706c8f0975a20271f3c3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Apr 2013 19:49:02 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-26956' of git://github.com/timhunt/moodle

commit eee20b123b42906be2101d5b70027a103efea94e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Apr 2013 16:23:44 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-mdl-38344' of git://github.com/rajeshtaneja/moodle

commit 899fd9372fb1693fa104a31bd512ba29d54fa5c9
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Apr 2013 16:11:01 +0800
Tag:    v2.5.0-beta

Merge branch 'master_MDL-38715' of git://github.com/danmarsden/moodle

commit ec6089f07b8ef7336de239382c2b6a3b2a795e2a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Apr 2013 14:53:28 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38455-master-int' of git://github.com/FMCorz/moodle

commit 92d1453bcbd68c3851d9ee9977ab871aada87e7d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Apr 2013 14:25:35 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35603-import-limit' of git://github.com/rlorenzo/moodle

commit 08e5aed273ba920d1dae28dc5339a5da66f04e50
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Apr 2013 11:49:24 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38825' of git://github.com/stronk7/moodle

commit bf9613dd416e8dde6249cbe3c327ab52c8189913
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Apr 2013 11:27:32 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38538_clean' of git://github.com/timhunt/moodle

commit cbaeabbe470f9206767d75936b93b66852fa727b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Apr 2013 10:04:26 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38702_master' of git://github.com/lazydaisy/moodle

commit 3a01c45ce9dc38d7b127ab06f30bacacbf3628ff
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 26 Feb 2013 13:36:24 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38115-master' of git://github.com/damyon/moodle

commit d28d214167bfe9360206c3a5a5f2116f434d99ad
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 26 Feb 2013 11:08:52 +0800
Tag:    v2.5.0-beta

Merge branch 'w08_MDL-38154_m25_delperf' of git://github.com/skodak/moodle

commit 84f72e28fd03687ff295fa72139038f0fa72cc2a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 26 Feb 2013 10:40:51 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38161' of git://github.com/stronk7/moodle

commit 2b32b2eea0fba467416d43174cc4406c5a2a4486
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Feb 2013 15:39:30 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-38163-m25' of git://github.com/samhemelryk/moodle

commit bbd045b9e6be42c4507ae09b3a75878840942f05
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Feb 2013 14:34:07 +0800
Tag:    v2.5.0-beta

Merge branch 'w08_MDL-38121_m25_plugincheck' of git://github.com/skodak/moodle

commit f4e34c5ffbcd65528331372d75689b109c1f569d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Feb 2013 14:32:01 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37770-master' of git://github.com/damyon/moodle

commit e1350c61d18f1e11baf127e220a9f67303c66006
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Feb 2013 14:19:36 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36832-master' of git://github.com/damyon/moodle

commit 92adcc1cf0a28cc53645a23daaa9575d5f8bed08
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Feb 2013 11:43:48 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37455-master' of git://github.com/marinaglancy/moodle

commit 24ace4b795333714b53df98e0991133928a593ca
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Feb 2013 11:00:03 +0800
Tag:    v2.5.0-beta

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

commit 5f0aeea1ce4879c19885ec0777a68a9784f75e7e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Feb 2013 10:43:52 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38164_master' of git://github.com/dmonllao/moodle

commit 1343f4c02b72d87d006bca988f99536a4d1950c9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Feb 2013 10:16:29 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38061-master' of git://github.com/damyon/moodle

commit fc7d3fdc84f2409d1d70e5ba741909aa18bccaf2
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 21 Feb 2013 22:11:37 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-33996-forum-advanced-timestamp' of git://github.com/mudrd8mz/moodle

commit 72c70f9d14cddb47a116182536b44fc06d8f693f
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 21 Feb 2013 09:38:05 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37997-muc-stats-display' of git://github.com/mudrd8mz/moodle

commit aa247695e78c6cd574fdd720ab0aebffc169e2d9
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 20 Feb 2013 14:27:27 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35622-master' of git://github.com/FMCorz/moodle

commit 61df003d53239a969cfb32cb18864d0e0166320e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Feb 2013 15:04:56 +0800
Tag:    v2.5.0-beta

Merge branch 'master_MDL-37660' of git://github.com/danmarsden/moodle

commit d3c6290328244c6d8b2d977bc1cf850c1cd5a52f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Feb 2013 14:07:13 +0800
Tag:    v2.5.0-beta

Merge branch 'w07_MDL-38059_m25_cachedir' of git://github.com/skodak/moodle

commit d0231ac9a9744f887928c76318283f0d543dd0f1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Feb 2013 13:54:52 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37217-master' of git://github.com/FMCorz/moodle

commit 28109804518ca8d2fa11b0f2e8207b1336d4e97d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Feb 2013 13:44:15 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38048-master' of git://github.com/FMCorz/moodle

commit fd507a8715d4c1df001d1521f377d3e426d894d6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Feb 2013 13:41:45 +0800
Tag:    v2.5.0-beta

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

commit 3770eadb8253e1df2f7eaee94ec697bf1956d4a0
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Feb 2013 13:31:11 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38047-master' of git://github.com/damyon/moodle

commit 7e94bdcca16b155f9635ab1a5a08fe8f0164fd9a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Feb 2013 11:34:07 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38009_master' of git://github.com/dmonllao/moodle

commit fdd91adabbad456cde5b5fe4838e9e0862a4a5c8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Feb 2013 11:23:39 +0800
Tag:    v2.5.0-beta

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

commit 5e4e086fecf516a7ac10c54cea14dfaa19ac28e3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Feb 2013 10:55:51 +0800
Tag:    v2.5.0-beta

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

commit 93a2d4e1a63b79b22491a02ea43bdc46297f492e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Feb 2013 10:33:50 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37858_master' of git://github.com/dmonllao/moodle

commit 858b3a2487a5a1f825a3809cead8d2f438617466
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Feb 2013 16:17:06 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37997-muc-stats-display' of git://github.com/mudrd8mz/moodle

commit 35b5c04f0b8cfde62f99446667e96aebe6275443
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Feb 2013 15:59:48 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38039_master' of git://github.com/lazydaisy/moodle

commit 9c70147d54c06be3f510d6432b31ba492f2d8214
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Feb 2013 15:54:22 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-31983-master' of git://github.com/FMCorz/moodle

commit 69898d6b9a55de53ee09f501e7bc4c6464a96547
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Feb 2013 14:22:02 +0800
Tag:    v2.5.0-beta

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

commit 3672b3b9b0fc659eb6563070de0feeba55910c2e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Feb 2013 14:18:25 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36380-master' of git://github.com/FMCorz/moodle

commit 93d5dc1c03f44a4625ff5311e878d35903376dc0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Feb 2013 12:23:51 +0800
Tag:    v2.5.0-beta

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

commit 32c3446fab23d3bef03d50df170e6c5c6d066ba7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Feb 2013 12:00:45 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37337-master' of git://github.com/damyon/moodle

commit 28d72ad973c85ad0e70968e54e4b54db8f408ff6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Feb 2013 11:31:07 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35622-master' of git://github.com/FMCorz/moodle

commit 8450149249a3288e583a8ee6459855e0911df0b5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Feb 2013 11:07:28 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-34800_ajax_submit' of git://github.com/andyjdavis/moodle

commit 583b20abd77056efbbaed8a16268ee316c00b97c
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 13 Feb 2013 15:47:27 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37883-master' of git://github.com/damyon/moodle

commit 6065652f243144960e0d320066ab0e13fd4cc24e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Feb 2013 16:13:48 +0800
Tag:    v2.5.0-beta

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

commit 6af8e417c395d0d8de03146adada33c89841d6ee
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Feb 2013 15:48:33 +0800
Tag:    v2.5.0-beta

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

commit 5c70d6505a2e7ec5d94067762baa1ca06af04a96
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Feb 2013 15:44:17 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37768_master' of git://github.com/dmonllao/moodle

commit 2b8741aaa66a2a050f977468077588f5dc08dc98
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Feb 2013 15:08:53 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-32076_unlimited2' of git://github.com/andyjdavis/moodle

commit 26f94655d5fabe43b8e16ebe046af5eef4a07e56
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Feb 2013 13:47:37 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37883-master' of git://github.com/damyon/moodle

commit 4dea0a7719424092a017be8f6b57788ef468b66f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Feb 2013 13:39:07 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37074-master' of git://github.com/damyon/moodle

commit 501bdad2b9a0cd4b8d5239b8b07591c52dd67eb8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Feb 2013 10:34:07 +0800
Tag:    v2.5.0-beta

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

commit 008a6514aeefbe1d5e556b4f417787f57384ca22
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Feb 2013 09:45:38 +0800
Tag:    v2.5.0-beta

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

commit 08eef1a4bdbbb4d3c6d08f558ef83eb79f93bc19
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Feb 2013 09:43:50 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37886_master' of git://github.com/dmonllao/moodle

commit 32f832b22b91eb7d4a99d2ac58680dd8713a9fcd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Feb 2013 16:43:34 +0800
Tag:    v2.5.0-beta

Merge branch 'master_MDL-35332' of git://github.com/totara/moodle

commit 354348865cec89386b108d04e35fe245f775d3ac
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Feb 2013 14:55:13 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-34137_label_dndupload' of git://github.com/davosmith/moodle

commit 9d7d0c4f2b0fd36a1dee111755462c7f98171f28
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Feb 2013 14:32:53 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37039-master' of git://github.com/damyon/moodle

commit 2ae00d0d3c324834c3ff691569a722810f611880
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Feb 2013 14:24:04 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37122-master' of git://github.com/damyon/moodle

commit acd561c66a2b84303552c865747759f9597c4164
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Feb 2013 13:58:36 +0800
Tag:    v2.5.0-beta

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

commit a614fb7457f8d8bcad8dc6a43ca9ab647f834701
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Feb 2013 10:56:07 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35819-m' of git://github.com/andrewnicols/moodle

commit 8c8d314ffd4da6ce2cb5896f8236ff37617cbe61
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 06 Feb 2013 14:21:03 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-35823-master' of git://github.com/phalacee/moodle

commit 69b2f366b18244340148ccd5648d8b28d8f79984
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 06 Feb 2013 13:42:47 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-35823-master' of git://github.com/phalacee/moodle

commit 6b106e2e8e8ed5fcce09237f32ce621eaf61e83b
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 06 Feb 2013 13:21:31 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-mdl-30144' of git://github.com/rajeshtaneja/moodle

commit da92e1b081d7c36bf63ca91022b96102a5c6cb35
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 06 Feb 2013 08:54:55 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37645-m' of git://github.com/andrewnicols/moodle

commit 9cf44c32b5112459cf9c9f4d0728385f2c0a99fc
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Feb 2013 15:25:08 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37572-m25' of git://github.com/samhemelryk/moodle

commit 6e59d6628c5a0929ab649938fb98452c587d836d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Feb 2013 13:51:17 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37164_message_self' of git://github.com/andyjdavis/moodle

commit 9631a80283350d008175def01d455367a083192e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Feb 2013 12:43:06 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37800_master' of git://github.com/grabs/moodle

commit ba076613d3f1a76d52e302a11814f4e4e0d3b986
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Feb 2013 10:47:15 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36986' of git://github.com/moodlerooms/moodle

commit d8d02951bbdfa29d1c22fac6669db46280faf366
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Feb 2013 10:25:57 +0800
Tag:    v2.5.0-beta

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

commit 837946d5f06e6d7459d12b5c10ccd530f17ad40b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Feb 2013 09:56:16 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37357_hidden_rank' of git://github.com/andyjdavis/moodle

commit a84939124430b1bb88f9e10171afb6f627ee9a59
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Feb 2013 09:29:25 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-35847-master' of git://github.com/phalacee/moodle

commit 78b161d39b7b0672d4c75e8cb2c2a263273cb7ea
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Feb 2013 16:11:11 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37574-m' of git://github.com/andrewnicols/moodle

commit 58e22287a6c8974fb1499f3a46bf7ef324baa3e4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Feb 2013 16:02:57 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37422' of git://github.com/colchambers/moodle

commit 6ac9f1596907bd006eee1cbbcc6af77fb594c924
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Feb 2013 15:54:43 +0800
Tag:    v2.5.0-beta

Merge branch 'master_MDL-29207' of git://github.com/danmarsden/moodle

commit 5389bd999dcb459d69dc3ce79e7648a06b3b19fa
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Feb 2013 14:30:07 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-32076_unlimited2' of git://github.com/andyjdavis/moodle

commit cf936fa297229d5580dc7538b9709be7770edf4b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Feb 2013 13:54:27 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-mdl-30144' of git://github.com/rajeshtaneja/moodle

commit 4ac341c9b6d9c26a6d536c59c6f367ee91e0aff4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Feb 2013 13:49:23 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37646-master' of git://github.com/damyon/moodle

commit d5a13bca0959935c178b9a28c6e3f2f224c3ae1e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Feb 2013 12:12:11 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37710-master' of git://github.com/damyon/moodle

commit b9299c61cac807ba70e83faca92ac7f26a1f2ae0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Feb 2013 11:56:45 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37635-master' of git://github.com/damyon/moodle

commit 40a008b33c1ceee7fb349176253a104623cfb468
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Feb 2013 11:29:22 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-32652_master' of git://github.com/pauln/moodle

commit 3428c00d43e72c7ca74621bac171e0f7ca0211a3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Feb 2013 11:23:41 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-35823-master' of git://github.com/phalacee/moodle

commit 7c433fa526b09b17176c041b73c65c9b1820e9d9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Feb 2013 10:26:32 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37645-m' of git://github.com/andrewnicols/moodle

commit e9c0ef3bcacf62165b970a0767bb5198d0d08d83
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Feb 2013 10:17:36 +0800
Tag:    v2.5.0-beta

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

commit 85ef4d45ca3de95d92cb5355e041f69562ed73cd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Feb 2013 10:12:54 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-25853-master' of git://github.com/FMCorz/moodle

commit 3895cdc2b74d6aa07e713c02d1968d43281c3e8e
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 31 Jan 2013 15:34:46 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37789_master' of git://github.com/dmonllao/moodle

commit 2c8d31cd72e1e9796a4fe367859994c77cbe6473
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 31 Jan 2013 10:14:46 +0800
Tag:    v2.5.0-beta

Merge branch 'master_MDL-34231' of git://github.com/danmarsden/moodle

commit 7543705d9bbed76bfec67475818a2a594e217493
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 30 Jan 2013 09:18:57 +0800
Tag:    v2.5.0-beta

Merge branch 'w04_MDL-37726_m25_prevnext_int' of git://github.com/skodak/moodle

commit 2a090a1581cee78b07a8f212ea602595054aec32
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Jan 2013 16:53:49 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-mdl-34190' of git://github.com/rajeshtaneja/moodle

commit cbb26eb0ec188e0ff6a6098df2637f708fcaff92
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Jan 2013 16:49:58 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37600' of git://github.com/timhunt/moodle

commit 0fed6554f90aaf918b70fa0105f3633e8e034925
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Jan 2013 16:31:50 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-33105' of https://github.com/ppichet/moodle

commit cc0ee3c4f3f6ad1530f7d0c44f565abf42fc276b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Jan 2013 16:30:00 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-29691' of https://github.com/ppichet/moodle

commit 4653ecd3b323c91a1ef3579ccc71d2318956e497
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Jan 2013 15:07:48 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37046_master' of git://github.com/dmonllao/moodle

commit 10b8d16debaba236af07432d72d5b01d79b2f5aa
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Jan 2013 13:46:26 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37656_master' of git://github.com/dmonllao/moodle

commit e0f755035b6276982bc35eac6febf0bb493552e8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Jan 2013 13:25:13 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37046_master' of git://github.com/dmonllao/moodle

commit 68aaba6c8474602e2db8f136594b7c8841a36b50
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Jan 2013 12:03:10 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37046_master' of git://github.com/dmonllao/moodle

commit 5d80fc80c066ef57379d3d51eb6b75332c1a4062
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Jan 2013 11:54:36 +0800
Tag:    v2.5.0-beta

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

commit 57748790609bbadaca484e66f58f86ddb70f4779
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Jan 2013 11:47:17 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37615-m25' of git://github.com/samhemelryk/moodle

commit c2f1837e5dd6d8b3299302900547ee74464c1efc
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Jan 2013 11:23:12 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-25630_master' of git://github.com/lazydaisy/moodle

commit a7b860a0c74aa1b39c0ab1bc747b8e342034cfd5
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 Jan 2013 15:56:27 +0800
Tag:    v2.5.0-beta

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit ebf6e8f60a764d8856ffa034d8449a3f5a00dfbe
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 Jan 2013 12:35:40 +0800
Tag:    v2.5.0-beta

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

commit a42a78754fca1ac6b6864ade267aeef85a358ecd
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Jan 2013 15:58:34 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37547-master' of github.com:damyon/moodle

commit 1c426a56f8879eac5fd6c4009b56284c61247a5a
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Jan 2013 15:53:20 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37082-master' of git://github.com/damyon/moodle

commit bc5165c2be35383ab5ef62f93a890b38a69a9cba
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Jan 2013 14:45:59 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37082_master' of git://github.com/markn86/moodle

commit ad3a730c3ade750c4ae26ba913422da61e296da1
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Jan 2013 08:54:32 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37506' of git://github.com/timhunt/moodle

commit 0a93b3127f1fd639e8e6df69bf621f5cc4063135
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Jan 2013 08:53:02 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37082_master' of git://github.com/markn86/moodle

commit 079b83f34eec240d2abd00cb3d2271a8854f7eaa
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 15:44:28 +0800
Tag:    v2.5.0-beta

Merge branch 'w03_MDL-36602_m25_mnetuser' of git://github.com/skodak/moodle

commit d7687c3a2387aeabf3567b7b036c5d6d58508b6d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 15:37:36 +0800
Tag:    v2.5.0-beta

Merge branch 'w03_MDL-37257_m25_enrolsettings' of git://github.com/skodak/moodle

commit bfaf3041fa5a28496014cc3a73db5336ee770ef0
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 14:00:26 +0800
Tag:    v2.5.0-beta

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

commit 499e1f11a55654abb355d5913709850a14a0172a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 13:40:02 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36138-master' of git://github.com/StudiUM/moodle

commit 5a4a346834444d379d63379c167661619944f304
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 12:58:27 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-33206-master' of git://github.com/StudiUM/moodle

commit f6623fe13071bec8f39a6c2982610b7da527aaa6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 12:51:51 +0800
Tag:    v2.5.0-beta

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

commit cba645b850dfc343db19dc880fa8b099d328f105
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 12:49:18 +0800
Tag:    v2.5.0-beta

Merge branch 'master_MDL-36853' of git://github.com/danmarsden/moodle

commit 928639c06e047564474970fd4e67b0dc6e0a80af
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 12:46:09 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37275_master' of git://github.com/markn86/moodle

commit 8f43dfac3a95eed7cacee5f9ae5378430f4a1ec7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 12:43:47 +0800
Tag:    v2.5.0-beta

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

commit 011ee6742f165d3b1edcfea68421eb6bbb8f0cdd
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 12:41:12 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37426-m' of git://github.com/andrewnicols/moodle

commit f5ba8b0f03cb7cf98e6c799c85fe3af39c17eec5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 12:35:54 +0800
Tag:    v2.5.0-beta

Merge branch 'w03_MDL-37593_m25_httpslogineditor' of git://github.com/skodak/moodle

commit 8cd57fb26a2d8cb0263bf4bc8b80cf34a59da2ef
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 11:53:10 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37430-master' of github.com:damyon/moodle

commit ad0bcfe6a6dfda596f1460c2a3617a820dc9a22f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 11:48:04 +0800
Tag:    v2.5.0-beta

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

commit 97d3e09cd8fdfe25c81aad2a3e962ca65b967c0d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 11:40:04 +0800
Tag:    v2.5.0-beta

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

commit 68a6d8768488bd52988c3832b9f3af776de50bcf
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 11:14:19 +0800
Tag:    v2.5.0-beta

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

commit c9ae6d3c271123200fc47bc40492cc7eab136bf7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 11:11:53 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-17812' of git://github.com/timhunt/moodle

commit 22aabad2d84cc61ad0a5541e89a00d915cf87757
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 09:05:46 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37358-master' of git://github.com/mouneyrac/moodle

commit 77ea8340de0382b966ee5eeb4166286f65892417
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Jan 2013 11:14:38 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37458_master' of git://github.com/dmonllao/moodle

commit 73ce4ac9966c4f3b223c01d90810c525d5d2b84c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Jan 2013 10:53:12 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37457_master' of git://github.com/dmonllao/moodle

commit b77cce5c5c309f79b9231d1e760945e4dc90e835
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Jan 2013 10:25:42 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-30769_iframe' of git://github.com/rwijaya/moodle

commit be576cb0e88fdf60477c2fd744cf08eb08f2b5a7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Jan 2013 10:15:16 +0800
Tag:    v2.5.0-beta

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

commit 2073bb76322d17796b3eade6018762c982383819
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Jan 2013 10:07:43 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35074_master_2' of git://github.com/pauln/moodle

commit 66bfd52a624a2d1e5f3a23a8abf44ef8bb95b7ae
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Jan 2013 10:03:34 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37527-master' of github.com:damyon/moodle

commit 94abbef12ffda1b8b994eb6e1d16a4a72e97b813
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Jan 2013 09:59:35 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-32652_master' of git://github.com/pauln/moodle

commit 2f61796c261123aa6f57619710648f252231a6f2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Jan 2013 09:04:57 +0800
Tag:    v2.5.0-beta

Merge branch 'w03_MDL-36809_m25_mysqlipers' of git://github.com/skodak/moodle

commit 3be10301e9e40e81060658176be80fc59e716115
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Jan 2013 09:01:00 +0800
Tag:    v2.5.0-beta

Merge branch 'master_MDL-36421' of git://github.com/danmarsden/moodle

commit a3891a2f4761821af3bd8396971bf251277bd804
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Jan 2013 14:27:21 +0800
Tag:    v2.5.0-beta

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit 361dfe65729bb8f07415ac1722f835f38b6fe009
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 17 Jan 2013 13:47:25 +0800
Tag:    v2.5.0-beta

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

commit b1ffa78675b65036698fb3f43106228e265ad8f5
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 17 Jan 2013 10:36:10 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-34398-m25-integration' of git://github.com/samhemelryk/moodle

commit b630c53591cd8ce6052a5429691a065cd4d77866
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 17 Jan 2013 10:22:55 +0800
Tag:    v2.5.0-beta

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

commit c5c50786f627dbc7035b798f759ca4276b0a71fb
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Jan 2013 14:17:40 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37085-master' of git://github.com/marinaglancy/moodle

commit ac6486e36fa6c4a7bd5aa775d064169b68837f22
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Jan 2013 13:51:58 +0800
Tag:    v2.5.0-beta

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

commit f2c87dd5308a20e08555ab24bfedd47d3f60c2f6
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Jan 2013 13:49:34 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37546-master' of github.com:damyon/moodle

commit 7acc743f061da4e3e0de10795c585b0f6672b53d
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Jan 2013 13:19:36 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36553' of git://github.com/rwijaya/moodle

commit 222f608433c3a5ec62bdeaab8dce7b10e792b669
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Jan 2013 13:16:40 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-36968-int' of git://github.com/marinaglancy/moodle

commit 0883d08fd04b351f080fc6164bfe1ce21bca96da
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Jan 2013 11:53:00 +0800
Tag:    v2.5.0-beta

Merge branch 'w02_MDL-37187_m25_flatfile' of git://github.com/skodak/moodle

commit 50ac16b8d0805db696962c49fe90a6b2abfe3e9b
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Jan 2013 11:45:22 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-31484_anonymous_user_clash' of git://github.com/davosmith/moodle

commit 856df69f3d0dcdc1bdd61405a17009f5df7574e1
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Jan 2013 11:39:03 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36708-master' of git://github.com/FMCorz/moodle

commit 0f94289c1dce2909efccbc936968ff8cac389fbb
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Jan 2013 11:18:18 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-33688_dndupload_progress' of git://github.com/davosmith/moodle

commit 47ee9f9100a4451a061ff9af0b96e872e6b4fb32
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Jan 2013 11:09:21 +0800
Tag:    v2.5.0-beta

Merge branch 'w02_MDL-35899_m25_cohortsort' of git://github.com/skodak/moodle

commit cb598688a8c4ba0bae46a4413e9d014d57a7f710
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Jan 2013 10:54:55 +0800
Tag:    v2.5.0-beta

Merge branch 'w02_MDL-37175_m25_paypalmanage' of git://github.com/skodak/moodle

commit 82420bbb913855f1dda200173c4f93180ea06ba3
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Jan 2013 10:19:57 +0800
Tag:    v2.5.0-beta

Merge branch 'w02_MDL-37184_m25_editenrol' of git://github.com/skodak/moodle

commit a201b57657d15c720b725e01ad3ab9513ac73f41
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Jan 2013 09:54:26 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36412-master' of git://github.com/sammarshallou/moodle

commit 12576d356af2a65ffbf13b7ba540ab1187c68c74
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 16:35:17 +0800
Tag:    v2.5.0-beta

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

commit 2773aa41de27f1b6433d45f866777d499c62f300
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 16:04:57 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-30070-master' of git://github.com/FMCorz/moodle

commit d7738ce27cbf237053023b0d695fb4943acea359
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 14:55:18 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36529' of git://github.com/colchambers/moodle

commit 864ff70c742e4197b0bccc1fddecef99c06fce4a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 14:44:28 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36534' of git://github.com/timhunt/moodle

commit a85d61e81272a9060fbdefc06c2aadab709ca253
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 14:32:22 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-28705_master' of git://github.com/dmonllao/moodle

commit 2429051d2f9e4695079925826ba1dc28d816263d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 14:29:41 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37381-master' of git://github.com/mouneyrac/moodle

commit 0efd8de527ab0fbbab7d5f9da0ec99ad6f4b42f3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 13:57:39 +0800
Tag:    v2.5.0-beta

Merge branch 'w02_MDL-36898_m25_ccontact' of git://github.com/skodak/moodle

commit 09ade47f55a631f34859289af7e8da512e52c263
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 13:55:50 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36708-master' of git://github.com/FMCorz/moodle

commit 85533e2a03faffa0850f445795525313f3954338
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 13:54:40 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37077-master' of git://github.com/ankitagarwal/moodle

commit 5b2d44e9cadeacc878b91f1379f8169d828eaccb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 13:43:20 +0800
Tag:    v2.5.0-beta

Merge branch 'w02_MDL-37391_m25_enrolconnection' of git://github.com/skodak/moodle

commit cd7d79d3ab532e8bda6cb33264bc9a2a1177326a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 13:36:44 +0800
Tag:    v2.5.0-beta

Merge branch 'w02_MDL-37064_m25_languser' of git://github.com/skodak/moodle

commit 9d40849d4683c6165ca60d283ee35ab2b6b3d7d2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 13:23:02 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37162_master' of git://github.com/pauln/moodle

commit 8b16bbfc68ad255cbae479ca1818e424cfb860fd
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 13:15:31 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35556d' of git://github.com/srynot4sale/moodle

commit bfee251334b2aa485780edd4e41bb7e800f1a99a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 13:13:53 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-33669' of git://github.com/equella/moodle

commit cc1521f57b94110f5a3b2c113fa5fe1ad2abbcc6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 13:11:46 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37355-master' of git://github.com/mouneyrac/moodle

commit 27885779bcfaa01d6c24f18dcf9bacc92a71cc3e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 13:06:10 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36991-master' of git://github.com/sammarshallou/moodle

commit 76a32e1a6fc087f317c2074e6e09ee5c319c993c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 12:59:33 +0800
Tag:    v2.5.0-beta

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

commit 01dcd9d77026e2fb4dd6b1b8b4b5ce4649a0c278
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 12:56:51 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35793' of git://github.com/timhunt/moodle

commit 9cbb0944c91341580971bf7b39881511ab609dfb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 12:54:28 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-28705_master' of git://github.com/dmonllao/moodle

commit d0827c938fdfd4de0ac4be87ebe197a0cc02ba32
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 12:51:48 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-30998-master' of git://github.com/marinaglancy/moodle

commit 37f3f3ac73f2fa1a57bd030d7ae2724a6b303a86
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 12:46:44 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-30316-master' of git://github.com/phalacee/moodle

commit b1be977406c29ed5a559b4ba7df6affc9142c1ea
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 12:43:59 +0800
Tag:    v2.5.0-beta

Merge branch 'w02_MDL-29596_m25_editauth' of git://github.com/skodak/moodle

commit aa452f97e37175d355f300c29bebb40f19be5d08
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 12:41:13 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-29835_master' of git://github.com/pauln/moodle

commit 97f236e747f03b1d9b8924b16a536023f77c39da
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 12:38:22 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-32341-master' of git://github.com/ankitagarwal/moodle

commit 28cfdfe180e60f5432f47ec1dd2dd4d2d24fa6aa
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 12:10:10 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37366-master' of git://github.com/andrewnicols/moodle

commit fb8585521a527fd8b76addf1a2aac7ca1ae7fd62
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 11:56:12 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-36035-m25' of git://github.com/samhemelryk/moodle

commit 4a489ba46544c9d46637c806756bf9ce8cd6623b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 11:48:11 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36616-master' of git://github.com/FMCorz/moodle

commit 0a9b944a1562111664e47134b348a80e007cf6b2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 11:19:40 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36587-master' of git://github.com/damyon/moodle

commit a0ea4d9fe1f26c9332880b28bf7f7753f6817e02
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 11:09:27 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37415-m' of git://github.com/andrewnicols/moodle

commit 121d7a3f7df8282bc543dc3f784ee6a7e58af784
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 10:58:31 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37413-m' of git://github.com/andrewnicols/moodle

commit 2254fb27643c4474dc38da4ea6232e0074ee1b05
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 10:42:31 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37194-master' of git://github.com/mouneyrac/moodle

commit 5c2aacc21c9e8b811620d4c19139839ecdf1694b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Jan 2013 15:34:29 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37143-master' of git://github.com/mouneyrac/moodle

commit 9695b2a596f2ab5cae56b93880971f5ffd9a9a16
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Jan 2013 15:26:09 +0800
Tag:    v2.5.0-beta

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

commit b75d99239d185202d18e18df22254ff6f6f2ad8b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Jan 2013 15:24:10 +0800
Tag:    v2.5.0-beta

Merge branch 'w02_MDL-37151_m25_mimetex' of git://github.com/skodak/moodle

commit 5590e85e1abfe6bbedff3d670bb6e6e7943c3e6d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Jan 2013 15:11:42 +0800
Tag:    v2.5.0-beta

Merge branch 'w02_MDL-37286_m25_tracebuffer' of git://github.com/skodak/moodle

commit ddaf0983b2938abe14003fd1bf0c6f5c13d8c58f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Jan 2013 15:05:15 +0800
Tag:    v2.5.0-beta

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

commit bf5f8a4f6013ae1c1e512c8daf3824bc58f32108
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Jan 2013 14:59:22 +0800
Tag:    v2.5.0-beta

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

commit 6c8d7fed668ecaae8be1894d9634bd3bf659527f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 16:49:47 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-7537_m25_paypalcur' of git://github.com/skodak/moodle

commit 6c74a228f3588167959d317bd08bcf902c7002a3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 16:40:50 +0800
Tag:    v2.5.0-beta

Merge branch 'wip_master_mdl-3941_add_support_for_LDAP_TLS' of git://github.com/iarenaza/moodle

commit 655b566b9e4449c2cbfdb8f23166d53834daca8a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 15:08:05 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37299_m25_manselfprogress' of git://github.com/skodak/moodle

commit 1a12cbd9dfe1f0bf4dc2cd8924495bb1d4538479
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 14:50:29 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-35685_m25_capinit_b' of git://github.com/skodak/moodle

commit bfb5580f92ec8213c67d887b60ef2e374b87111a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 14:46:14 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-32639-master' of git://github.com/FMCorz/moodle

commit 81a38f50fb476e19877618b404fe9719573a8307
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 14:40:15 +0800
Tag:    v2.5.0-beta

Merge branch 'wip_master_mdl-28585_ldap_auth_doesnt_handle_password_expiration' of https://github.com/iarenaza/moodle

commit c37c9e760db17c8bb4620362a720f7d9c3939fb4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 14:29:32 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37125_m25_yui380' of git://github.com/skodak/moodle

commit 397e4ecf76983fab304e69a43885869956ecebcf
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 14:26:52 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37282_m25_tinymce358' of git://github.com/skodak/moodle

commit df0b14c3b51d25a2f08c1e04da66d2eedb744b7e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 14:22:11 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37303_m25_enrolinstancestatus' of git://github.com/skodak/moodle

commit 7f3e944aa121fcbc328bbe54cf2296f41fee7cea
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 14:15:22 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37304_m25_authdbcleanup' of git://github.com/skodak/moodle

commit d161e374885a31c635aeb2e2ab15d20c05c5fd42
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 13:57:47 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36738-master' of git://github.com/ankitagarwal/moodle

commit 87ffc3fb6925ba7b1ecb242f8c448b2605810ce9
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 13:01:00 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-27901-master' of git://github.com/FMCorz/moodle

commit 3dab21591d9a79cb11de39c7e57c8fe0dc7189c5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 12:58:16 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-21116_m52_reversedel' of git://github.com/skodak/moodle

commit 7378493ee9b0d7143c2a5124c09e50a8bcfe9364
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 12:50:44 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37247_master' of git://github.com/markn86/moodle

commit 4c345a1ed410bd091c6bbcc53414f9a5cc2a2211
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 12:20:54 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36955' of git://github.com/jmvedrine/moodle

commit b5b418b2a7f7eee1bfae29cd8901f9a56376f236
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 12:17:51 +0800
Tag:    v2.5.0-beta

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

commit f858088cc49371df340e84bd610266d9c895954d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 11:16:43 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37191_m25_plugindelete' of git://github.com/skodak/moodle

commit cfb209a538bc484f9ed5b6221683858c5d55c53e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 10:54:01 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-31641_drag_drop_help' of git://github.com/davosmith/moodle

commit 230a3774741972445b74d8d498f8a1a66852ef97
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 10:50:46 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35130-master' of https://github.com/mackensen/moodle

commit a57ce0fde46bfcadfb1960913c4468b9000cfcc8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 10:48:13 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37297_m25_enrolcatprogress' of git://github.com/skodak/moodle

commit 00079538b99f40e689a7eb2e6179eacafb2aa24a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 10:30:50 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36456-master' of git://github.com/FMCorz/moodle

commit a1d9f433ecf5c5911c180c130222d1b0c907b4d8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 10:26:44 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37301_m25_coursecatinfoas' of git://github.com/skodak/moodle

commit 36b6340532328773ac8d1e8ad5efcb3177c8b4d3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 10:24:01 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37254_m25_courseinfoas' of git://github.com/skodak/moodle

commit a275bedb38f7a29d93ff724be735a35333b1c0ad
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 10:16:19 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37298_m25_enrolcohprogress' of git://github.com/skodak/moodle

commit e06c710e8783634739e6a95996b99d235992f26e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 09:52:29 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37293_m25_enroldbprogress' of git://github.com/skodak/moodle

commit bfa2b0382f64d49c740e26d5b5baa8a180054cf0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Jan 2013 13:59:52 +0800
Tag:    v2.5.0-beta

Merge branch 'MDLmaster-MDL-37157-2' of https://github.com/OdyX/moodle

commit 5083fe219487cb0a4eb8e21fb275692b3daf9b2e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Jan 2013 13:56:57 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37128_m25_rssrestore' of git://github.com/skodak/moodle

commit 8057d3ee777f457b58e7e9c900ae9267280a0461
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Jan 2013 13:53:14 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-36893_m25_mnetestrict' of git://github.com/skodak/moodle

commit 6f4cf4656eff4e689f62ecc88fc1df2a073d15d9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Jan 2013 13:41:16 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35230-master' of git://github.com/andrewnicols/moodle

commit bc897f9d6304a4bd8d1516e1937189484f8f2314
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Jan 2013 13:30:24 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-27884-master' of git://github.com/ankitagarwal/moodle

commit f7551c2e62e29a7d3d0036d2ed3b0e55a4f117a0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Jan 2013 09:42:31 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36667-master' of git://github.com/damyon/moodle

commit b20d65f27176a3ae21e19499411a04b65e19d723
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 24 Dec 2012 12:23:03 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37037-master' of git://github.com/damyon/moodle

commit 5066f30bed10f69572ba3a30786ae8d515a87828
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 24 Dec 2012 11:34:40 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37233_m25_skype' of git://github.com/skodak/moodle

commit 33950c3039ce4b0b5ba4d4d30b3ecdf46519a2c7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 24 Dec 2012 11:22:43 +0800
Tag:    v2.5.0-beta

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

commit 1b5c5e578854e6c4df8fc38210e86b5d8e9441d6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 24 Dec 2012 10:54:51 +0800
Tag:    v2.5.0-beta

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

commit 51feee1f6468ef181c1bd58f2f3394950c7e9b7c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 24 Dec 2012 10:35:33 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37283_m25_spell' of git://github.com/skodak/moodle

commit 86575fa70955811b455437a8422c36afc6d9e47d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Dec 2012 14:57:43 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36704-master' of git://github.com/sammarshallou/moodle

commit 033b07895c3559a05ad359486f29cb80d77bc7d6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Dec 2012 14:52:27 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37014_webdav_folders' of git://github.com/davosmith/moodle

commit 3ab43c05020de908c1a8a05d631e8dc384971828
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Dec 2012 14:25:52 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36259' of git://github.com/timhunt/moodle

commit 3280819b209eed86b8e4a1d5d285ac8787386b60
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Dec 2012 09:10:42 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-30899_master' of git://github.com/dmonllao/moodle

commit 62347c883bc0634e649ac2b88a6055772204fe16
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 15:28:39 +0800
Tag:    v2.5.0-beta

Merge branch 'w50_MDL-36493_m25_mysql' of git://github.com/skodak/moodle

commit 0b10485a03f70732458ca2fe1c79e91d8928ba50
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 15:25:22 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37114' of git://github.com/timhunt/moodle

commit f136e27f15d8c7cb3826d6186d8d73069e5ce5da
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 15:21:31 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37034-CategoryNavigationKey' of https://github.com/iamandrew/moodle

commit dfa45f7ddc92f0f829f6ba707ba2bfeae6e8fbda
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 13:51:32 +0800
Tag:    v2.5.0-beta

Merge branch 'w50_MDL-36597_m25_courselang' of git://github.com/skodak/moodle

commit efda4a83402ff7d780b098cb7aaf03e52b9ace54
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 13:47:44 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-29334_master' of git://github.com/markn86/moodle

commit 8ca70aff14c00a3395853f2b1cc832e68a75a37c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 12:08:57 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-mdl-36736' of git://github.com/rajeshtaneja/moodle

commit 9199e53de2afe581d01c209f7a2995334f45dc57
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 12:05:05 +0800
Tag:    v2.5.0-beta

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

commit bfcbbc9833f7055c62e020cb45627e13373e98d6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 11:52:55 +0800
Tag:    v2.5.0-beta

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

commit 00a9fa5d9afb4a06863a5f887a471b76775d9300
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 11:48:32 +0800
Tag:    v2.5.0-beta

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

commit 06ae410844a62225025244cb0ecd739956df1999
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 11:36:57 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37078-master' of git://github.com/sammarshallou/moodle

commit a8103b1c078f83ac8c1a35c61263396ecf56daa8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 11:30:27 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37165-master' of git://github.com/damyon/moodle

commit aa3258d5869cfdb503f8eb22a0d0fe9bb7c07e33
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 13 Dec 2012 09:54:17 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36897' of git://github.com/timhunt/moodle

commit 7ac94cab86d9e2feb5282afa8d7162e5dd9e0098
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 12 Dec 2012 08:43:29 +0800
Tag:    v2.5.0-beta

Merge branch 'master_MDL-35737' of git://github.com/danmarsden/moodle

commit 02dd021d264096a486f24b6acb40806adb070fb5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 17:54:24 +0800
Tag:    v2.5.0-beta

Merge branch 'w49_MDL-36447_m25_gdtest' of git://github.com/skodak/moodle

commit 70f4fddae500d3780defb9ff6dfaf94cf9eb6f51
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 17:51:50 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37098' of git://github.com/timhunt/moodle

commit cba50c00885abf48a0ff88c35cb4f5e690c34731
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 16:24:10 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36243' of git://github.com/jmvedrine/moodle

commit 09f5d8344ebaee1cc59711df3fc597416432e720
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 16:03:09 +0800
Tag:    v2.5.0-beta

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

commit 6236442aad5ea122375cd56408871beb89b06966
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 15:18:50 +0800
Tag:    v2.5.0-beta

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

commit c3c2fc538ae7673e44fe283f427f6ff179a59ae4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 14:00:25 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36712-master' of git://github.com/damyon/moodle

commit 021504b547adce0c78d44b99c6b1be847de273df
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 13:56:28 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36591-master' of git://github.com/damyon/moodle

commit 0fd3fb0c835b8a3b1bff1f88cf979cbd59d0dee1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 13:54:15 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36897' of git://github.com/timhunt/moodle

commit 4cc8e8cbb1f9c6bdd19ce8bffd38ce83efb2683e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 13:22:42 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-34791-master' of git://git.luns.net.uk/moodle

commit 358414748c7305882a23a5dc466fe2840994e313
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 12:18:12 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36808-master' of git://github.com/sammarshallou/moodle

commit 4889da21995557039ddbdfb118648d871f34cc6e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 12:09:10 +0800
Tag:    v2.5.0-beta

Merge branch 'w49_MDL-36983_m25_ordertext' of git://github.com/skodak/moodle

commit 624b0c3f1dc8057d7d07168282e206e9613b46ad
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 12:07:06 +0800
Tag:    v2.5.0-beta

Merge branch 'w49_MDL-36892_m25_enrolreadme' of git://github.com/skodak/moodle

commit cdb7110f72c14d8ba512dca5272b93daf8bdcb65
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 11:58:44 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36845' of git://github.com/timhunt/moodle

commit fa18df40c11ea9d44aea68cdd7aaaf52e446327d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 11:44:11 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36828' of https://github.com/aolley/moodle

commit b62f0f8d82f8ddf1c60511082d9547327d59608a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 11:32:53 +0800
Tag:    v2.5.0-beta

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

commit 595282dfcc09e8187a53b1aa911941ff08e5b9b2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 11:17:29 +0800
Tag:    v2.5.0-beta

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

commit 5d44e45264aa780819ddecfde91d983085c6eeb8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 11:06:28 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36025-negative-zero' of git://github.com/mpetrowi/moodle

commit 74bf44284ab25f525c7a5edf39248ec2286bb3d4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 10:49:12 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35476-master' of git://github.com/damyon/moodle

commit 6434a6c76e7cbb51c676b48dded27d2e7bf53a46
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 10:39:19 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-34052-master' of https://github.com/damyon/moodle

commit d4b2190728a5ad300e2c45f0d6963656ce092e91
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 10:31:33 +0800
Tag:    v2.5.0-beta

Merge branch 'w49_MDL-31424_m25_paypalcase' of git://github.com/skodak/moodle

commit b3b4fad9943aaa01da1d8cc3a01e53cb24f2406d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 09:56:40 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36773-master' of git://github.com/mouneyrac/moodle

commit e3b494e379c3ee2bfb43b5ee4039ab3cf95703a8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 19:37:24 +0800
Tag:    v2.5.0-beta

Merge branch 'w49_MDL-36737_m25_glossstrict' of git://github.com/skodak/moodle

commit 91c547760625bd0089cfb5d4ef5374c9d53b0955
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 19:32:10 +0800
Tag:    v2.5.0-beta

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

commit 76089dc378b8210267c6688f54b0c5f689b1ccfe
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 17:31:41 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36167-master' of git://github.com/damyon/moodle

commit 69e0b225c1d192ec6c38b6c2e3b2f420fb85cedf
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 15:17:46 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36732' of git://github.com/timhunt/moodle

commit adce3fa8338ca77a83dad2d6416b77c8a763ea1a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 14:18:32 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36549' of git://github.com/rwijaya/moodle

commit 3b49f655b24a3bfd3cbfec2aebbee0bf9893ca4b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 14:04:22 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36856' of git://github.com/kastashov/moodle

commit 9278e2dbef623d95c3888865b2f7e9460edc3a22
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 14:01:56 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36835-master' of git://github.com/damyon/moodle

commit 8df07e50869950f4c20b41052227744a5b166f8f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 13:06:37 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36538_webdav_memory' of git://github.com/davosmith/moodle

commit 9c714c83b73d2d9a747c81f1f0f811a9206bc6e0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 12:03:03 +0800
Tag:    v2.5.0-beta

Merge branch 'w49_MDL-35456_m25_paypal' of git://github.com/skodak/moodle

commit 2e6aff57e554d00844a4f095215841eae5479d1c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 11:36:38 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35404' of git://github.com/timhunt/moodle

commit 7689a5837afc13ca70f93b5d1141b051be8a7c01
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 11:08:42 +0800
Tag:    v2.5.0-beta

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

commit d31c08b69855288de479d4fa1ae219e3bc301deb
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 09:56:09 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36680_hidden' of git://github.com/andyjdavis/moodle