Git merges in Moodle x.x.x by Dan Poltawski

commit 34f7e31ffbb75e5b5903d10dda796253d8371418
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 11 Apr 2014 14:31:27 +0800
Tag:    v2.7.0-beta

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

commit 9d1eed69a0b9f9aef5e98acb923f33be710f9b0a
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 11 Apr 2014 13:01:38 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44981-master' of git://github.com/jamiepratt/moodle

commit d6a756a949a99910943f7528f0ac47ceafbb0b83
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 11 Apr 2014 12:55:15 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44980-master-v2' of git://github.com/jamiepratt/moodle

commit 8a69b046e5524b904bcd1b39ad02e1fdef79b2b9
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 11 Apr 2014 12:48:14 +0800
Tag:    v2.7.0-beta

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

commit f940d3ad6d8d99117724b430fc3d8ea02c8a8292
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 11 Apr 2014 11:39:52 +0800
Tag:    v2.7.0-beta

Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

commit e5d3f6ea262f835fa4c29e5394c8f0f0e3c13eb4
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 10 Apr 2014 14:51:42 +0800
Tag:    v2.7.0-beta

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

commit c8d940a5a64a8eeafbc479b26f76f10bb80b37f7
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 10 Apr 2014 14:09:15 +0800
Tag:    v2.7.0-beta

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

commit 1a1949437b8aa653a8eb117da31dab5163462911
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Apr 2014 17:37:24 +0800
Tag:    v2.7.0-beta

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

commit 8921c6c0c24b0261203846db51d4971048e98d5b
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Apr 2014 15:32:30 +0800
Tag:    v2.7.0-beta

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

commit 3c72b711913ba5e347526160e672593b8c763aca
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Apr 2014 14:03:42 +0800
Tag:    v2.7.0-beta

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

commit a935cccb2b31044b15e9ef15bf64fd0ef7fbdfc6
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Apr 2014 12:49:35 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-31679' of git://github.com/aolley/moodle

commit c559161f4ab0988ebb8219105313d0ecb4045738
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Apr 2014 12:38:30 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-39759_http_response_code_master' of https://github.com/dongsheng/moodle

commit 9eeacad9b8d8f97b5e99ce12ca469248ba51d106
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Apr 2014 11:52:33 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44507_master' of https://github.com/SWiT/moodle

commit 1b9a1e812830648ed763906cc095cd5bda6b7f09
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Apr 2014 11:38:42 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-29572_master' of https://github.com/jrchamp/moodle

commit 020af1058dfacbb87ee37f8ca67f60e98cacee4f
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Apr 2014 11:12:55 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-39740_grade_item_idnumber_fix' of git://github.com/ashleyholman/moodle

commit a5cd92574df710b004cd9a96ba114dc40aeadeee
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Apr 2014 14:11:59 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-42462-Feedback-Fix-for-WCAG-2-0-issue-with-Informational-and-Error-Content-Displayed-in-red' of https://github.com/michael-milette/moodle

commit 052d51b15f8ca9c10b002fc9f44b83c5ce844b24
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Apr 2014 13:53:19 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44241-master' of git://github.com/andrewnicols/moodle

commit 822b055c61f19e4e88a3a4fee135b7a9461e81d1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Apr 2014 12:12:01 +0800
Tag:    v2.7.0-beta

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

commit d0a3cec5642e9231fc1f92570c400879f05fb024
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Apr 2014 12:07:15 +0800
Tag:    v2.7.0-beta

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

commit 9a59ebaa6cdae3543d3a278da4abdbdf90180a7c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Apr 2014 12:04:41 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44810-master' of git://github.com/jethac/moodle

commit 23cc5bbdc0de8fc81b4aeff3bf64a648d4c41957
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Apr 2014 11:37:25 +0800
Tag:    v2.7.0-beta

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

commit 95ce54f0607ce792414384b669c790c007834870
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Apr 2014 11:27:59 +0800
Tag:    v2.7.0-beta

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

commit 36e051dab441adb13e7efed16dcd6903c4b11e7f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Apr 2014 09:45:07 +0800
Tag:    v2.7.0-beta

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

commit 3a047312b612dfd6fef2cccba85c13094d5bb9df
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Apr 2014 09:22:38 +0800
Tag:    v2.7.0-beta

Merge branch '42317-27' of git://github.com/samhemelryk/moodle

commit b48eaedeb9833ad6ddf9c39c509ae5a6089eebf5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Apr 2014 17:28:34 +0800
Tag:    v2.7.0-beta

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

commit 4834cfdf591cbf6f2ef8c54a3f6a482fe79d9170
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Apr 2014 16:58:46 +0800
Tag:    v2.7.0-beta

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

commit e2e1622946247422a53b5d909a95f66a48e670e8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Apr 2014 16:10:14 +0800
Tag:    v2.7.0-beta

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

commit 5e8be14cb98b3f70b0867e9c4623760c621dcc35
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Apr 2014 16:01:56 +0800
Tag:    v2.7.0-beta

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

commit 0678d092138dfa270e44638243e1dfb97cb2ba7a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Apr 2014 13:10:41 +0800
Tag:    v2.7.0-beta

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

commit d69f584fe6841d9e3213df4536cf316a101ce681
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Apr 2014 10:53:56 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-mdl-44945' of https://github.com/rajeshtaneja/moodle

commit 1c9e738b542c4ab7516c5bc745f7eb5d19506db1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Apr 2014 10:28:27 +0800
Tag:    v2.7.0-beta

Merge branch '41551-27' of git://github.com/samhemelryk/moodle

commit 3c87c0880e2eab0bd09ed58de0ec01b06accd27c
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 26 Mar 2014 16:25:39 +0800
Tag:    v2.7.0-beta

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

commit 1696ee80505add0b9e287bd203fa34558ce669da
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 26 Mar 2014 05:15:50 +0800
Tag:    v2.7.0-beta

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

commit 41244dd3cec905f03b49655445a158939b73c16a
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 12 Mar 2014 13:56:46 +0800
Tag:    v2.7.0-beta

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

commit 06a241bb8db6ea106a1fbf05c6b39f3c0366e53f
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 12 Mar 2014 13:47:11 +0800
Tag:    v2.7.0-beta

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

commit 45ff52dab52214cbfaab11b7dfbdb2a397b05007
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 12 Mar 2014 09:08:50 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44061-master' of git://github.com/andrewnicols/moodle

commit 9b9e2655d20aab4c6472912f3b03e49840b261fb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Mar 2014 17:53:49 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44478-master' of git://github.com/andrewnicols/moodle

commit 454db7d467fa9c2f9ccc8340ebbf086dae1d23c3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Mar 2014 17:06:14 +0800
Tag:    v2.7.0-beta

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

commit c6b7551c71084b498c6883420dcff7bf094873ee
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Mar 2014 16:59:16 +0800
Tag:    v2.7.0-beta

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

commit 7d1f141a44d502f6e9c4ef0c45e4f036a7489db9
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Mar 2014 15:50:41 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44095' of https://github.com/shashirepo/moodle

commit a8aa086bf95c886992e9722383a919b46fc6362a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Mar 2014 15:41:57 +0800
Tag:    v2.7.0-beta

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

commit d8085046ba33775c686bbdfe53e304c7001ea627
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Mar 2014 15:30:02 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-mdl-44458' of https://github.com/rajeshtaneja/moodle

commit 72e2a1d7eb9d8c6922238843fd3daf03d1d3d72d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Mar 2014 14:35:51 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44480-master' of git://github.com/andrewnicols/moodle

commit 234f953c440f53b85a4147df8cd36a628390fab6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Mar 2014 12:59:23 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-41855' of git://github.com/nobelium/moodle

commit b027184f107784ec46c0cd98f8036119d4f65ba6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Mar 2014 12:42:27 +0800
Tag:    v2.7.0-beta

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

commit 8674c5e41556851574d72a2c1d5c597715f66400
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Mar 2014 12:35:57 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44497-master' of https://github.com/jamiepratt/moodle

commit 5f3b4694b35bd12c0d087e4f6bce3cd13ffede29
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Mar 2014 11:37:44 +0800
Tag:    v2.7.0-beta

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

commit 060aa628b3806846d89249862b229fe260c47a98
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Mar 2014 11:28:56 +0800
Tag:    v2.7.0-beta

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

commit c7cc278017d60506ef7b0e7f87e78dd1b2fd8f33
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Mar 2014 10:50:55 +0800
Tag:    v2.7.0-beta

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

commit 4e1aad54b8b25bd6332e05e77f9ab8c860ee94e4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Mar 2014 15:13:43 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-mdl-44017' of https://github.com/rajeshtaneja/moodle

commit 7f42ee92eb715dfb7cbd4fb7d27dd8450482ec20
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Mar 2014 13:45:26 +0800
Tag:    v2.7.0-beta

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

commit c13c64b0e11ebb005582fb2b4d6161de3568a851
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Mar 2014 12:04:14 +0800
Tag:    v2.7.0-beta

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

commit 93881b80114741d3acd8eb45e1eedede87640f7e
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Mar 2014 14:21:28 +0800
Tag:    v2.7.0-beta

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

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 864ea90d6d553fb0e166be76d842f910d914449a
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Mar 2014 14:18:22 +0800
Tag:    v2.6.2

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

commit ac8d049b47553cf26f801845e414c6173c9cb579
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Mar 2014 14:18:21 +0800
Tag:    v2.7.0-beta

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

commit 7442e32e87d3a6c7ad7c6bbc3650307d99529806
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Mar 2014 14:13:35 +0800
Tag:    v2.6.2

Merge branch 'MDL-43930-26-fix1' of git://github.com/damyon/moodle into MOODLE_26_STABLE

commit 08b47e61785a44823952dfd1a6bcda3fe1136648
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Mar 2014 14:13:23 +0800
Tag:    v2.7.0-beta

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

commit a59b2e18d84b036a235a5cc5d5b10cac3649d5b3
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Mar 2014 12:47:17 +0800
Tag:    v2.7.0-beta

Merge branch '44180-27' of git://github.com/samhemelryk/moodle

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 a77f82dacf2cd43a1612ec61c3345ec7c26afcb8
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Mar 2014 12:39:56 +0800
Tag:    v2.6.2

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

commit 3be87d897de4f40dde7b9b2b69eb9eac6caf4815
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Mar 2014 12:39:53 +0800
Tag:    v2.7.0-beta

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

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 ed9e1428d13a96d74716012a5435af18606b0d13
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Mar 2014 11:22:37 +0800
Tag:    v2.6.2

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

commit baa1c694088940ba86c48d9a7288670cabcc3e23
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Mar 2014 11:22:35 +0800
Tag:    v2.7.0-beta

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

commit cb34249fe08cc14a4cbfcc0c3cdd71afb48de6d3
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Mar 2014 11:08:31 +0800
Tag:    v2.7.0-beta

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

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 730440dcf46a52f7095363db7b50d146e5b6b40d
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Mar 2014 10:52:50 +0800
Tag:    v2.6.2

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

commit 673a96bd4eb18e428e9d68c9cdcd59272bf8f7e3
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Mar 2014 10:52:46 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44065-master' of https://github.com/sammarshallou/moodle

commit 602a3bd3decaefb533ff83226775de7cb0ce9c59
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Mar 2014 17:50:07 +0800
Tag:    v2.6.2

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

commit 81cbf283e84b8c544940af0898c232ae8bb723e7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Mar 2014 17:49:06 +0800
Tag:    v2.7.0-beta

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

commit 5b2f2af6cd62db5c33458a936ce3c14a722aa205
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Mar 2014 16:00:01 +0800
Tag:    v2.6.2

Merge branch 'MDL-44272-26' of git://github.com/ankitagarwal/moodle into MOODLE_26_STABLE

commit f1284d3cfeb89d65d8c79922e0545bb4add8a714
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Mar 2014 15:59:55 +0800
Tag:    v2.7.0-beta

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

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 6a37f9898e4d23930cb6a3ba095ce9570d3e637c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Mar 2014 15:43:26 +0800
Tag:    v2.6.2

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

commit 3071e2bbf98b828f98f776c587678f71306972b4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Mar 2014 15:43:23 +0800
Tag:    v2.7.0-beta

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

commit cf77b7c9325fe469144daa2e6b2e39d0c9c64a39
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Mar 2014 15:03:02 +0800
Tag:    v2.7.0-beta

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

commit 5d4abb97b21212db0738d16b514aa784abca4271
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Mar 2014 14:41:32 +0800
Tag:    v2.6.2

Merge branch 'MDL-44436-26' of git://github.com/FMCorz/moodle into MOODLE_26_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 745f2cc521de768499c6c0e5bca2972625ce37dd
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Mar 2014 14:40:23 +0800
Tag:    v2.7.0-beta

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

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 013de6d5d47ec0416e4f73ec7a23af6615bd22ca
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Mar 2014 12:56:13 +0800
Tag:    v2.6.2

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

commit 1723cc26f6e902b06bd4b36cea2af5284afeec2d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Mar 2014 12:56:08 +0800
Tag:    v2.7.0-beta

Merge branch 'm27_MDL-43852_SWF_Not_Embedded_By_Mediaplugin_Filter' of https://github.com/scara/moodle

commit d129de37617497289df7ad52b5cd15b5741cf6fd
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Mar 2014 07:38:56 +0800
Tag:    v2.7.0-beta

Merge branch 'w10_MDL-44358_m27_stylesrefact' of https://github.com/skodak/moodle

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 5a02170cb3ce97828fab484139880fff98e808d7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Mar 2014 15:15:23 +0800
Tag:    v2.7.0-beta

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

commit 51214dd2d18e1238d0eee299ccf7a8d418cdb228
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Mar 2014 15:15:20 +0800
Tag:    v2.6.2

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

commit f504e63daaf7caa1eaea413cc0b42f66335a2a53
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Mar 2014 13:50:18 +0800
Tag:    v2.7.0-beta

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

commit d5c7462a6a4cdc03f0b8b47b5e5edec2ac79e34c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Mar 2014 13:34:35 +0800
Tag:    v2.6.2

Merge branch 'wip-MDL-44362-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

commit a8b07dbf98e3f2cd2e5f16689e8994bceb175391
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Mar 2014 13:33:40 +0800
Tag:    v2.7.0-beta

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

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

Merge branch 'w06_MDL-43344_m24_flow' of https://github.com/skodak/moodle into MOODLE_24_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 818f4f953ccc7005d2fbaa45228201620034c358
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Mar 2014 10:07:16 +0800
Tag:    v2.7.0-beta

Merge branch 'w06_MDL-43344_m27_flow' of https://github.com/skodak/moodle

commit 6b25f55ec9cf04776dd26ccf3644f59203305630
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Mar 2014 10:07:15 +0800
Tag:    v2.6.2

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

commit b79f8bbb5462853d324174e06215b2253b0ed8d2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Mar 2014 09:36:54 +0800
Tag:    v2.7.0-beta

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

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 233f8b265a5c947d110dc0580d27e162d84c6b9c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 25 Feb 2014 15:34:00 +0800
Tag:    v2.6.2

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

commit d4c01301ec3ed9624e39bf75cce4ec93e54733a5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 25 Feb 2014 15:33:58 +0800
Tag:    v2.7.0-beta

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

commit a5fc3f08edab57253cb5163e1a69270891a538c7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 25 Feb 2014 11:22:24 +0800
Tag:    v2.7.0-beta

Merge branch '44185-27' of git://github.com/samhemelryk/moodle

commit 3d4cec649aac123bbc1c648b1a291606729e8f24
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 25 Feb 2014 10:47:20 +0800
Tag:    v2.7.0-beta

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

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 e274eece15efe0144e8fb944b3afaccd6dbccbd5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 25 Feb 2014 10:30:36 +0800
Tag:    v2.6.2

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

commit e78e671f298b8616f3210a3b4b93c6395321dd8a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 25 Feb 2014 10:30:35 +0800
Tag:    v2.7.0-beta

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

commit 305b15f4ab505a48fa66e7226c25de57afc92127
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 25 Feb 2014 09:27:35 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43478-master-v4' of git://github.com/jamiepratt/moodle

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 a43aa9fbf13606eb0a16c0dcb50ecc0a0c4a3fdc
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 19 Feb 2014 09:16:49 +0800
Tag:    v2.6.2

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

commit 7f1a4f6e2253efb6f30a70cf2d57dc122d0665c4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Feb 2014 14:41:34 +0800
Tag:    v2.7.0-beta

Merge branch '44212-27' of git://github.com/samhemelryk/moodle

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 29b3c5dfc6fdbf1e920bbc309d1769cad67817b1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Feb 2014 14:14:00 +0800
Tag:    v2.6.2

Merge branch 'm26_MDL-43541' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE

commit 197e3ccb8fa1d832c99f544ac3349bbefcde62f4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Feb 2014 14:13:58 +0800
Tag:    v2.7.0-beta

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

commit d08598bc8b18491de7e04fa33840375093a12053
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Feb 2014 13:39:08 +0800
Tag:    v2.7.0-beta

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

commit a500fd06ce011833e928effb18172b195a22a31d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Feb 2014 14:48:01 +0800
Tag:    v2.7.0-beta

Merge branch '44158-27' of git://github.com/samhemelryk/moodle

commit a24ef7d7cdbbb39291799eb6638eecf7e09dce88
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Feb 2014 14:40:36 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-33099-master' of git://github.com/andrewnicols/moodle

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 3b854e8c2add3959ddbc3c1db4b87d1998a1c685
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Feb 2014 12:13:39 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-42618_master' of git://github.com/SWiT/moodle

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 06a8eb06f32953d97e45b5a573aff40aacb6f203
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Feb 2014 12:06:46 +0800
Tag:    v2.6.2

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

commit 35a8d26926cdc6e03481823fb6c421187cc0e985
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Feb 2014 12:06:42 +0800
Tag:    v2.7.0-beta

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

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

Merge branch 'MDL-42033_26' of git://github.com/jmvedrine/moodle into MOODLE_26_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 0a9f5b66c52b0d76613e153cbd1a5e9f1168bf04
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Feb 2014 10:32:33 +0800
Tag:    v2.7.0-beta

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

commit 6fe1f72ca00ae5c69107c995946a1bd340f3e1de
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 23 Jan 2014 09:32:36 +0800
Tag:    v2.7.0-beta

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

commit 259d41fcb994eee12096069d0a4f68ffb51ecbe4
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 22 Jan 2014 09:15:52 +0800
Tag:    v2.7.0-beta

Merge branch 'w03_MDL-43661_m27_edulevel' of https://github.com/skodak/moodle

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 8f89ca5780df1a3cbf7a7c58a969d75bf4b80e85
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 23:29:25 +0800
Tag:    v2.6.2

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

commit 73cb5874b6fe67c0f30aee8413c219e6d3a83344
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 23:29:20 +0800
Tag:    v2.7.0-beta

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

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 32418eeee0e4dba2865b1d5d269a858560bf6ec3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 15:21:20 +0800
Tag:    v2.6.2

Merge branch 'mdl34020-moodle26' of https://github.com/tlock/moodle into MOODLE_26_STABLE

commit 0758665c0d2b24987df85b9c9e21213798f28c9a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 15:21:17 +0800
Tag:    v2.7.0-beta

Merge branch 'mdl34020-master' of https://github.com/tlock/moodle

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 0469922b5fd6519973ff4f9a9cf1c64da8a36adb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 14:49:27 +0800
Tag:    v2.6.2

Merge branch '43714-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE

commit 0eea6f5d99db814182f54a3d05ac23354e7bb717
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 14:49:26 +0800
Tag:    v2.7.0-beta

Merge branch '43714-27' of git://github.com/samhemelryk/moodle

commit 1cbda6fabdaa6aec198dcb501da07b3775585ac0
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 14:28:52 +0800
Tag:    v2.6.2

Merge branch 'MDL-43760-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE

commit 8a04a045b3bb4aa52fa9894d8292a711625b1c50
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 14:28:50 +0800
Tag:    v2.7.0-beta

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

commit 1f77f14fb93d3e8f78f4485e11a9bafb9339626c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 12:24:41 +0800
Tag:    v2.6.2

Merge branch 'wip-MDL-43700-26' of git://github.com/abgreeve/moodle into MOODLE_26_STABLE

commit e8d79c2d4be86496330c07b0ac5641b2f5b96239
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 12:24:38 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-MDL-43700-master' of git://github.com/abgreeve/moodle

commit 574111a94e3ae3830a648483513e0868cdeec20e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 12:19:36 +0800
Tag:    v2.6.2

Merge branch 'MDL-43717_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE

commit d5b5f1a38b62cf8a393264a01c30287c946fe08f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 12:19:34 +0800
Tag:    v2.7.0-beta

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

commit 1f931e2928c572b5c836adc409d070e1c58289ca
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 11:25:38 +0800
Tag:    v2.7.0-beta

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

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 66b74e5aa533cd2dfb23dbd06e1a73602a7138aa
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 11:21:54 +0800
Tag:    v2.6.2

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

commit d0a0768b7fc64826889d60106f6b27493983df51
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 11:21:52 +0800
Tag:    v2.7.0-beta

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

commit 0296662a2238975ced223ac813a76581ec4bc437
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 10:37:01 +0800
Tag:    v2.7.0-beta

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

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 5f074a6bb0eaf9947ea052d4c7d0ce4e6dedaef4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 15:29:21 +0800
Tag:    v2.6.2

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

commit 1db62f7ff41e702167c50e1bffc9d9c0fb001e97
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 15:29:15 +0800
Tag:    v2.7.0-beta

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

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 4f02d0074ac60155e2b2525cac2dfc991ee08d09
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 15:25:49 +0800
Tag:    v2.6.2

Merge branch '42682-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE

commit 8e576176543776e193f6596e407bd791154d7ef2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 15:25:46 +0800
Tag:    v2.7.0-beta

Merge branch '42682-27' of git://github.com/samhemelryk/moodle

commit 1605660ad21cc16fdf27945da1179a46d8fb7d59
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 14:24:44 +0800
Tag:    v2.6.2

Merge branch 'MDL-43690_26' of git://github.com/timhunt/moodle into MOODLE_26_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 395333abe9dcfdef1becbd87cc1246079bca197d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 14:24:38 +0800
Tag:    v2.7.0-beta

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

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 8a073e4364e888637dddff9b7dc2bda51b978559
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 12:56:20 +0800
Tag:    v2.6.2

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

commit 3ab0a93347a8ef5046da7977e105f708966b45e7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 12:56:17 +0800
Tag:    v2.7.0-beta

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

commit 37b0d3adad1f23ed391ec68f0e9c40e62f3344ee
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 10:53:53 +0800
Tag:    v2.6.2

Merge branch 'MDL-43671_message_26' of https://github.com/andyjdavis/moodle into MOODLE_26_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 fa8861964ab0627883d15ba16a92349e3a1210f1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 10:53:50 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43671_message' of https://github.com/andyjdavis/moodle

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 da2e9d519b4c2ee81c785e2a001bcdfb09b73779
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 10:33:38 +0800
Tag:    v2.6.2

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

commit 67deeb244d55c9430b44a97bf0621c77feda51f5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 10:33:36 +0800
Tag:    v2.7.0-beta

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

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 e53eb2a2086be762aa466d2f01d1dfdebbe88c9c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 09:45:44 +0800
Tag:    v2.6.2

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

commit e6fbca9f65aa4449509b66bb08bd404d79a1c5e3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 09:45:43 +0800
Tag:    v2.7.0-beta

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

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 0b8749c89217bf0c2823fc205ad498f9d6bbcd14
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 09:26:12 +0800
Tag:    v2.6.2

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

commit 34e91c304c301319c085fb4a912be9f0c4262ad7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 09:24:53 +0800
Tag:    v2.7.0-beta

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

commit c8c8e6c2de76b0e8af9658a3e40ecd7427b826e4
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 16 Jan 2014 09:40:58 +0800
Tag:    v2.7.0-beta

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

commit b19608d6828b8229cdb448eb817fb13eac4df746
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 15 Jan 2014 11:41:05 +0800
Tag:    v2.7.0-beta

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

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 05297cc0a86e28c19a5e0b53a8f4f845083f4453
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 15 Jan 2014 08:20:39 +0800
Tag:    v2.6.2

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

commit 852c34e5092de7d2db773d556bdc3cee2cc3c983
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 15 Jan 2014 08:19:49 +0800
Tag:    v2.7.0-beta

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

commit f9d14c4cd7f977f12f087e9504d49479d25f76c7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 16:50:09 +0800
Tag:    v2.6.2

Merge branch 'MDL-43664-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 473924dfd5f0de2b6dd00f3fa7e215940e8a95ec
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 16:50:07 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43664-master' of git://github.com/andrewnicols/moodle

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 79c8b9fcae6e3754e455d921578329298d4b7659
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 15:58:12 +0800
Tag:    v2.6.2

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

commit 824dccead31afef7cc872bff1ee21647b58facf5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 15:57:05 +0800
Tag:    v2.7.0-beta

Merge branch 'm27_MDL-43577_Incorrect_Variable_Expansion' of https://github.com/scara/moodle

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 33d83d755ac726fdb08397e604a3c642ed1f7dcb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 15:48:52 +0800
Tag:    v2.6.2

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

commit 2c9c8c7f461e43cf8f8ffc09d49700732519e15c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 15:48:49 +0800
Tag:    v2.7.0-beta

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

commit 4a2ac9676af8989fbb8271dc892c39886a74dccd
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 15:37:04 +0800
Tag:    v2.6.2

Merge branch 'm26_MDL-43575_Typo_In_The_Overridden_setOption' of https://github.com/scara/moodle into MOODLE_26_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 00ae4c4ead9d0ca85d2c9790a8021c95db63ae9c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 15:36:58 +0800
Tag:    v2.7.0-beta

Merge branch 'm27_MDL-43575_Typo_In_The_Overridden_setOption' of https://github.com/scara/moodle

commit b901d0e9dd75b213601e3ce9d6b3421fc18cc999
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 15:26:52 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43178_forum' of https://github.com/andyjdavis/moodle

commit 30354dc0d2a6256b412e4f2dfd8a22286dce1b7b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 15:26:52 +0800
Tag:    v2.6.2

Merge branch 'MDL-43178_forum_26' of https://github.com/andyjdavis/moodle into MOODLE_26_STABLE

commit 2be353c1950de300e7524118db1b9f1319760b61
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 15:00:11 +0800
Tag:    v2.7.0-beta

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

commit 88457992baa1368b48aa79cdf6c03f4a58cf777e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 14:46:55 +0800
Tag:    v2.7.0-beta

Merge branch 'w02_MDL-43529_m27_globals' of https://github.com/skodak/moodle

commit 4198f7f9037cf259ace3ecd0a5f1c686aafc37da
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 14:43:45 +0800
Tag:    v2.7.0-beta

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

commit 198b1facc3d99e204a9e167c4b2557bd1586a2d6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 14:21:06 +0800
Tag:    v2.7.0-beta

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

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 1e65c37e973e7ef354185057383a8115c28e1ba1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 11:28:44 +0800
Tag:    v2.6.2

Merge branch 'm26_MDL-42792' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE

commit 986c3f27eefab4f91e06a3496b4276f56f4f3ae6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 11:28:39 +0800
Tag:    v2.7.0-beta

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

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 b3eacbd5dafe0d233dafce3157ece07ab75b8a6f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 10:46:34 +0800
Tag:    v2.6.2

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

commit 4be67945aa56f4ed5fd7e1fb5ff7a80a304136b2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 10:46:22 +0800
Tag:    v2.7.0-beta

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

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 a377868a50757dbbf94c8a95052fac9d735cdc31
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 15:50:34 +0800
Tag:    v2.6.2

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

commit 06cdbf8382fc2edd3596d3eada815d0900f83714
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 15:38:22 +0800
Tag:    v2.7.0-beta

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

commit d1426e2843a9b57145e1494c933290dbea0e3f4e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 12:55:36 +0800
Tag:    v2.7.0-beta

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

commit 8c0ddd430a4bff4373be92bf3d7d98695c580348
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 12:42:13 +0800
Tag:    v2.7.0-beta

Merge branch '43598-43262-27' of git://github.com/samhemelryk/moodle

commit 4d2984c136b892745c9fc3b50ca8155fd548c1e6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 12:37:26 +0800
Tag:    v2.6.2

Merge branch '43598-26' of git://github.com/samhemelryk/moodle into MOODLE_26_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 6719aa5ec57b6195127d896820a579baaf53021e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 12:34:58 +0800
Tag:    v2.6.2

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

commit dbfdd1a4f9abd416ee73cf00d2b4c6013cb84935
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 12:34:53 +0800
Tag:    v2.7.0-beta

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

commit 3ef74a63a62366b4d6c56f0f69d0a46d7d14608c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 12:11:17 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43262-master' of git://github.com/andrewnicols/moodle

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 d9dcb97bbe6142ba477fbf72b2ad4960d6d2ea79
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 11:11:12 +0800
Tag:    v2.6.2

Merge branch '41226-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE

commit f9276172a2f3b1afc3135e8cf2878169c03edb52
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 11:11:10 +0800
Tag:    v2.7.0-beta

Merge branch '41226-27' of git://github.com/samhemelryk/moodle

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 51bced46a7c64ef5e470deb2217c9a4c8f1f36d8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 11:03:37 +0800
Tag:    v2.6.2

Merge branch '40821-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE

commit 58c8f0290f190876ba27e0b8c0fb7d3a053e9f50
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 11:02:18 +0800
Tag:    v2.7.0-beta

Merge branch '40821-27' of git://github.com/samhemelryk/moodle

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 a893680091eaa581263170cb6bfc0250a507e1f2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 10:07:54 +0800
Tag:    v2.6.2

Merge branch '40693-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE

commit e41761a5e9953abd23d7297dd65ffdf85bebec49
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 10:07:53 +0800
Tag:    v2.7.0-beta

Merge branch '40693-27' of git://github.com/samhemelryk/moodle

commit fb9360db3aaa0759953ab5250b9c48f553ab18d7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 10:03:51 +0800
Tag:    v2.7.0-beta

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

commit 67a75acaffc80e767d3fd9ef1a479cda0e055891
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 10:03:47 +0800
Tag:    v2.6.2

Merge branch 'MDL-41152-26' of git://github.com/FMCorz/moodle into MOODLE_26_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 892173b3f35e3fddb313953c154dd6dcdeaa94b9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 09:36:12 +0800
Tag:    v2.6.2

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

commit b5c8e7cbc38c3993022bd0817c4c6210df9aff9a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 09:35:50 +0800
Tag:    v2.7.0-beta

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

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 bc7a77f14d6f43b8c5fcf1546602acac34755b53
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 08:54:23 +0800
Tag:    v2.6.2

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

commit f6652bc750f0583eb07ab45aa652324508fad321
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 08:54:22 +0800
Tag:    v2.7.0-beta

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

commit 135634fbd38c905c14fe7819ec749e0a4f5ff2b2
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 08 Jan 2014 14:33:11 +0800
Tag:    v2.6.1

Merge branch 'wip-MDL-43606-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

commit 7de1b42f557376c91e6b9a96add442c44aa90ff9
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 08 Jan 2014 14:32:57 +0800
Tag:    v2.7.0-beta

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

commit 33c6c949e5210a63c6d0809c313a9a018cbb56d2
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 08 Jan 2014 11:56:53 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43534-master' of git://github.com/andrewnicols/moodle

commit f446874d53f7d5224cdab4726519d33d62ff0224
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 08 Jan 2014 11:43:39 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43532-master' of git://github.com/andrewnicols/moodle

commit d99f765ee6baf125ed8fb7ac541e18e7591fc1c2
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 08 Jan 2014 11:34:48 +0800
Tag:    v2.6.1

Merge branch 'MDL-43595-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE

commit a6fa74bca396de5e1c80fb3e61b103b12fb24b54
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 08 Jan 2014 11:34:46 +0800
Tag:    v2.7.0-beta

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

commit e86b3c7335f0f8d8a508017a1fce9afdf4cd3074
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 08 Jan 2014 08:21:09 +0800
Tag:    v2.6.1

Merge branch 'MDL-43173_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE

commit 267d4927b4d52d6f3559b499f8570dc20297bb43
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 08 Jan 2014 08:21:06 +0800
Tag:    v2.7.0-beta

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

commit 7d374cdf4aaac4d226fff63e9cec41273c360347
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Jan 2014 17:28:15 +0800
Tag:    v2.7.0-beta

Merge branch 'w01_MDL-43510_m27_test404' of https://github.com/skodak/moodle

commit d829440fedcbebe65de557fbba96f7fb697d2fc0
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Jan 2014 17:26:01 +0800
Tag:    v2.6.1

Merge branch 'w01_MDL-43510_m26_test404' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit ac60c5b60ea6ee64090d29c06175f7aace3701c8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Jan 2014 17:23:07 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43270-master' of git://github.com/andrewnicols/moodle

commit cf51a722c7597b8083584bb423f863301b367d59
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Jan 2014 17:20:57 +0800
Tag:    v2.4.8

Merge branch 'm24_MDL-43482_Lot_Of_Passed_By_Reference_Messages' of https://github.com/scara/moodle into MOODLE_24_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 e57bc1637c48816520437a32f03d9e6f765903d2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Jan 2014 17:20:49 +0800
Tag:    v2.6.1

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

commit 571944c2a1df91a551e3019b907179b4c1ac2fd5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Jan 2014 17:20:44 +0800
Tag:    v2.7.0-beta

Merge branch 'm27_MDL-43482_Lot_Of_Passed_By_Reference_Messages' of https://github.com/scara/moodle

commit 6d0796942bad47da21bd8bdfdda16fe9aa394136
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Jan 2014 15:46:59 +0800
Tag:    v2.7.0-beta

Merge branch 'w01_MDL-43481_m27_passwords' of https://github.com/skodak/moodle

commit 899ca7632ff22ba49f507fd9f911702f89d73689
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Jan 2014 13:48:49 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43489-master' of git://github.com/andrewnicols/moodle

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

Merge branch 'm24_MDL-40379_Prevent_Some_Mobile_Network_Providers_From_Modifying_Content' of https://github.com/scara/moodle into MOODLE_24_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 9fe6a6f42be7c05c9511f10d10bad7bcf9812dce
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Jan 2014 12:43:29 +0800
Tag:    v2.6.1

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

commit 4e5fb5bec1dc6d7eabba314eb29f22b88e4941ed
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Jan 2014 12:42:33 +0800
Tag:    v2.7.0-beta

Merge branch 'm27_MDL-40379_Prevent_Some_Mobile_Network_Providers_From_Modifying_Content' of https://github.com/scara/moodle

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 836399115b310467f512045e97ac77ef05b99814
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Jan 2014 11:51:18 +0800
Tag:    v2.6.1

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

commit 812cc702ade057891d8fdff0ab1a65d80573e7dc
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Jan 2014 11:51:15 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-42995-master-3rd' of git://github.com/FMCorz/moodle

commit adb28ab708b3113208125e5f9ccdb1c559e93634
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Jan 2014 11:08:28 +0800
Tag:    v2.6.1

Merge branch 'wip-mdl-43521-m26' of https://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE

commit 7afca0ff5a21bde61a33604dc806a1fe9d4f82cc
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Jan 2014 11:08:23 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-mdl-43521' of https://github.com/rajeshtaneja/moodle

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 883ea035afffe367e4b4cc7b7a649d990611bd3b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Jan 2014 11:00:12 +0800
Tag:    v2.6.1

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

commit a6b4b3350fed6ab884c79ca6bfef1894745225f7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Jan 2014 10:59:40 +0800
Tag:    v2.7.0-beta

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

commit 93759b73a5611f316ea8d1e4597b0e333f77957a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Jan 2014 10:55:20 +0800
Tag:    v2.7.0-beta

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

commit ce3dbebc914931a74f538431c483ed0c1e0bd898
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Jan 2014 10:43:39 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43373-master' of https://github.com/tonyjbutler/moodle

commit 62bfe6202ebad64ee209c709e794b4ac0d0d9f66
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Jan 2014 10:34:40 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43323-master' of git://github.com/andrewnicols/moodle

commit 00447fd617fc8283ebe0e62839188e95b9ad2eb1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Jan 2014 15:11:23 +0800
Tag:    v2.7.0-beta

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

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

Merge branch '43349-24' of git://github.com/samhemelryk/moodle into MOODLE_24_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 e3e938b861183035901d5e1b55eca4eace060c3d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Jan 2014 14:21:45 +0800
Tag:    v2.6.1

Merge branch '43349-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE

commit da444e200c58da3f6a754cde344902c051479da5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Jan 2014 14:21:44 +0800
Tag:    v2.7.0-beta

Merge branch '43349-27' of git://github.com/samhemelryk/moodle

commit 0394a0eefe735a108ccc5b763452fc4b20bdd14e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Jan 2014 10:06:11 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43408-master' of https://github.com/tonyjbutler/moodle

commit 70f1ddba87f672d7bccef11da9a6f7bef6fb70e1
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 19 Dec 2013 10:56:41 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-mdl-43437' of https://github.com/rajeshtaneja/moodle

commit e575b2f6d1bfb79ea54854b5a7d45d17f29f92e1
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 18 Dec 2013 15:00:11 +0800
Tag:    v2.4.8

Merge branch 'MDL-41198-24' of https://github.com/mr-russ/moodle into MOODLE_24_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 8d7c3b0d503ffaa632f75b4a3914068d7aca6ac9
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 18 Dec 2013 14:59:59 +0800
Tag:    v2.6.1

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

commit eab9fa0ef1b79910e8dbb68cc09f2d95a4969c50
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 18 Dec 2013 14:40:18 +0800
Tag:    v2.7.0-beta

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

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

Merge branch 'install_26_STABLE' of git://git.moodle.org/moodle-install into MOODLE_26_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 9aeef5043474dbc0c60927a00010e9101d4987d7
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 05 Dec 2013 15:09:56 +0800
Tag:    v2.4.8

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

commit c33ea63147801a766d3a9821a2e2d11c7c1f5cad
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 05 Dec 2013 15:09:47 +0800
Tag:    v2.7.0-beta

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

commit a6a85dc49b7f882568cca19f326e6db424bafc99
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 05 Dec 2013 09:34:04 +0800
Tag:    v2.4.8

Merge branch 'MDL-43068_24' of git://github.com/timhunt/moodle into MOODLE_24_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 b01548ecba574d1425d2510b03e1d7cd692b2c17
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 04 Dec 2013 15:44:08 +0800
Tag:    v2.6.1

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

commit 0f18e134fb6ca8b6a53a702d2e236c1b9a9222b6
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 04 Dec 2013 15:44:03 +0800
Tag:    v2.7.0-beta

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

commit 307d9612776e2b610cb32d22632633025ad44d22
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 04 Dec 2013 15:06:30 +0800
Tag:    v2.6.1

Merge branch 'wip-mdl-43028-m26' of https://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE

commit 50de5b4c06a55239bdefe77ec3907bf0a383a469
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 04 Dec 2013 14:57:24 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-mdl-43028' of https://github.com/rajeshtaneja/moodle

commit 03579d47ca3765f0c8e8a192d057665a1f2f6836
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 04 Dec 2013 11:30:09 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-42563_filter_algebra_thirdpartylibs.xml' of https://github.com/tmuras/moodle

commit d22147667d0a555850d8d2afbb9952a3315a01f2
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 04 Dec 2013 08:53:25 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-mdl-42597' of https://github.com/rajeshtaneja/moodle

commit 9fff2532931aa30f7dbaf1c097d3dad12176b253
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 04 Dec 2013 08:36:05 +0800
Tag:    v2.7.0-beta

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

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 0e44ba37cf1f7830cdec6a180a11071e8259c7e1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Dec 2013 16:08:22 +0800
Tag:    v2.6.1

Merge branch 'moodle26-mdl43020' of https://github.com/tlock/moodle into MOODLE_26_STABLE

commit 9c25a183fa3aaec5aac947fa0c5e7a1292b2e86f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Dec 2013 16:08:15 +0800
Tag:    v2.7.0-beta

Merge branch 'master-mdl43020' of https://github.com/tlock/moodle

commit a9d04b9b91e8d4c36f73fc6aece4fb2e5d13405c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Dec 2013 16:01:22 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-42989-master' of git://github.com/andrewnicols/moodle

commit 8761a4f15d01c787492ebd1051e9146bd126bc41
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Dec 2013 15:21:09 +0800
Tag:    v2.7.0-beta

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

commit 77325154af2b7d122a47fc6668105a8e8b376248
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Dec 2013 13:46:26 +0800
Tag:    v2.6.1

Merge branch 'wip-mdl-43028-m26' of https://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE

commit 753eb47edc44a4935fbb3c518376c10deeceaef7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Dec 2013 13:45:59 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-mdl-43028' of https://github.com/rajeshtaneja/moodle

commit 4ab19f9c71f603fba027b421b499b07a70054022
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Dec 2013 12:52:10 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-mdl-43028' of https://github.com/rajeshtaneja/moodle

commit ebe051792daab7a9cfdd5c9e8894c8c885950b8c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Dec 2013 12:41:03 +0800
Tag:    v2.7.0-beta

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

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 61ae30255c737930111db70c09a9fe70486e6c6f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Dec 2013 12:36:52 +0800
Tag:    v2.6.1

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

commit 03742ae8f98cb079f8ee16408394abebac6b08d4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Dec 2013 12:36:50 +0800
Tag:    v2.7.0-beta

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

commit cd515a94218da7bd993b45e21b4ff409481268b7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Dec 2013 11:41:06 +0800
Tag:    v2.7.0-beta

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

commit 8d8e6f9607bbbc66d8d4bf2ee273f4de849387e6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Dec 2013 10:07:10 +0800
Tag:    v2.7.0-beta

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

commit d8be1d9ac5288c980c1243d3c2b714e202a9b72b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Dec 2013 14:53:37 +0800
Tag:    v2.6.1

Merge branch 'MDL-42989-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 6bc8b35add622f0fcfe4ec7af3c150b8b59f9bed
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Dec 2013 14:52:03 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-42989-master' of git://github.com/andrewnicols/moodle

commit 4b9e9fcb01633dfbf501576893e68eec4d1049c5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Dec 2013 14:23:48 +0800
Tag:    v2.7.0-beta

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

commit d76bc30606dd3bef1ce22ab12c1321b1a0a9fccf
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Dec 2013 11:58:23 +0800
Tag:    v2.6.1

Merge branch 'w49_MDL-43106_m26_doublecookie' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 466aa444719f4ab811323df5333b1f06c4d50299
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Dec 2013 11:58:01 +0800
Tag:    v2.7.0-beta

Merge branch 'w49_MDL-43106_m27_doublecookie' of https://github.com/skodak/moodle

commit 838a2120fb72703cb22c6699f4c3525d769b84e2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Dec 2013 11:19:49 +0800
Tag:    v2.4.8

Merge branch 'wip-MDL-40191-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_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 0c94afe7afa8192f4b3c2903750155afddc77b6c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Dec 2013 11:19:45 +0800
Tag:    v2.6.1

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

commit 10c12c94a811f0a6c47760703c126afe1917eb98
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Dec 2013 11:19:41 +0800
Tag:    v2.7.0-beta

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

commit d8d43cdc183184d741f3f51c7badfbc6ed9d0365
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Dec 2013 11:11:12 +0800
Tag:    v2.4.8

Merge branch 'MDL-43068_24' of git://github.com/timhunt/moodle into MOODLE_24_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 9a7de39d7a9d819a3c56ab4b3f27cde996c6e4ca
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Dec 2013 11:11:07 +0800
Tag:    v2.7.0-beta

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

commit 6ba3f5d72a342cf6712fea01965371257dfda58e
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 29 Nov 2013 12:52:52 +0800
Tag:    v2.6.1

Merge branch 'install_26_STABLE' of git://git.moodle.org/moodle-install into MOODLE_26_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 83f506da1edf82f003df64b105e9eb5ba360f6c8
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 29 Nov 2013 12:52:42 +0800
Tag:    v2.4.8

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

commit 4f42752d705296e1867262345dcca46a8b640ba2
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 29 Nov 2013 12:52:35 +0800
Tag:    v2.7.0-beta

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

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 9e56dabab6e118258a9ef0faa151263de7f52c3e
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 27 Nov 2013 11:37:25 +0800
Tag:    v2.6.1

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

commit eeb6b7847b0f9baddc2bcc87294daef1e76c828f
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 27 Nov 2013 11:32:23 +0800
Tag:    v2.7.0-beta

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

commit c96069566ab4586a140f30b1d66775151a46f302
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 27 Nov 2013 11:14:52 +0800
Tag:    v2.4.8

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

commit 7d784e4ade06ae40f651fb142164f6f4f3c2e2e2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 26 Nov 2013 15:06:41 +0800
Tag:    v2.4.8

Merge branch 'MDL-43000_24' of git://github.com/timhunt/moodle into MOODLE_24_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 bb296779659ef8e5e765dbb6c7e18c15cfeefc12
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 26 Nov 2013 15:05:42 +0800
Tag:    v2.7.0-beta

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

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 44e5ac93bcf758e5d258e3d5a653d0a2a20288de
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 26 Nov 2013 14:57:15 +0800
Tag:    v2.6.1

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

commit 2bc34d65288ff36ce11f4978523c643c0cda5523
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 26 Nov 2013 14:52:21 +0800
Tag:    v2.7.0-beta

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

commit 46d1d519f831f28f5046f180deb3ee4381093849
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 26 Nov 2013 14:48:38 +0800
Tag:    v2.6.1

Merge branch 'MDL-42851_m26' of git://github.com/rwijaya/moodle into MOODLE_26_STABLE

commit fb9c770d8d4b3c4a288184a83b2bc203ffd7ffce
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 26 Nov 2013 14:48:21 +0800
Tag:    v2.7.0-beta

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

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 ace15cee6da08d6011eabd4daca2e7045e88c5d9
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 26 Nov 2013 13:24:41 +0800
Tag:    v2.6.1

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

commit 6ac888c5f214a0919a39950af0f5e4c596a731ca
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 26 Nov 2013 13:24:02 +0800
Tag:    v2.7.0-beta

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

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 e55207d9d7a3287d34e00d5f7e7e46be24c7e450
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 26 Nov 2013 12:09:47 +0800
Tag:    v2.6.1

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

commit c9ed9e56621d9903e67f33310c2543c05a77cdab
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 26 Nov 2013 12:09:45 +0800
Tag:    v2.7.0-beta

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

commit 5ffad8a4063e23b6573d2371c766ed6520070776
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 26 Nov 2013 10:42:08 +0800
Tag:    v2.6.1

Merge branch 'MDL-43050_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE

commit 01db5af468d8f05bec31589a4eb78563e2230bb2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 26 Nov 2013 10:42:04 +0800
Tag:    v2.7.0-beta

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

commit e5ca507c6e9cbfa96ac9b450a9dc0360d7de9f79
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 26 Nov 2013 10:25:05 +0800
Tag:    v2.4.8

Merge branch 'wip-mdl-41635-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_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 00b965f60942fcab69c03106946620d1a8321e5c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 26 Nov 2013 10:25:01 +0800
Tag:    v2.6.1

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

commit 4bf3517bc7b1f2fe1093e278d7f457af27cb583b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 26 Nov 2013 10:24:59 +0800
Tag:    v2.7.0-beta

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

commit 25da2fe06545910fa86f62afd51fd883fbcf3939
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Nov 2013 15:43:44 +0800
Tag:    v2.7.0-beta

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

commit 117c147757dcfafafa895e04d48a8fdfae2e57a5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Nov 2013 13:41:00 +0800
Tag:    v2.4.8

Merge branch 'w48_MDL-37016_m24_sloppymysql' of https://github.com/skodak/moodle into MOODLE_24_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 749db57b4c396a71afe84312af29a59d7c37e9d6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Nov 2013 13:40:56 +0800
Tag:    v2.6.1

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

commit b7e6b82155a69e44712ca8106d09a01755d9ddda
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Nov 2013 13:40:54 +0800
Tag:    v2.7.0-beta

Merge branch 'w48_MDL-37016_m27_sloppymysql' of https://github.com/skodak/moodle

commit 0f4ea5911c48275c9c1f59a6ff6924ed7ca3be10
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Nov 2013 12:22:56 +0800
Tag:    v2.6.1

Merge branch '43016-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE

commit e7f52df8f68fba70bccadc0aad5134bcb7a4632d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Nov 2013 12:21:20 +0800
Tag:    v2.7.0-beta

Merge branch '43016-27' of git://github.com/samhemelryk/moodle

commit 83a97ce6c7ab712d092c99d7f776e6a091901108
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Nov 2013 11:17:47 +0800
Tag:    v2.7.0-beta

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

commit 6508a3c68ecefa9cadbfd151d9aea34d450f0a22
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Nov 2013 11:06:41 +0800
Tag:    v2.6.1

Merge branch 'wip-MDL-43024-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

commit 43e72c1f6ac1d6cee8bb7be739fbfeed5e929ef3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Nov 2013 11:06:39 +0800
Tag:    v2.7.0-beta

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

commit 9e2bc0490f8e48ae532d3210580fa3093309c0e1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Nov 2013 10:49:02 +0800
Tag:    v2.6.1

Merge branch 'MDL-42858_m26' of git://github.com/rwijaya/moodle into MOODLE_26_STABLE

commit f5bc16cbd167cd96556961114b9452427b090bf2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Nov 2013 10:48:33 +0800
Tag:    v2.7.0-beta

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

commit a2aceccdbed274a6efa448947c4c2503ff16b9f0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Nov 2013 10:43:31 +0800
Tag:    v2.6.1

Merge branch 'MDL-42957-26' of git://github.com/jamiepratt/moodle into MOODLE_26_STABLE

commit 717612c7aa04932607d393aaf569751f97221bfd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Nov 2013 10:37:40 +0800
Tag:    v2.4.8

Merge branch 'MDL-42547_m24' of https://github.com/markn86/moodle into MOODLE_24_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 d3ec6a9dcf9915fecdccac41694cc78f85ecd052
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Nov 2013 10:37:36 +0800
Tag:    v2.6.1

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

commit a136e16c8e44184dc961c19b428267503d850f58
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Nov 2013 10:37:33 +0800
Tag:    v2.7.0-beta

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

commit f7b47f1c0ce746db65eade4d878943b20d70ce7b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Nov 2013 11:43:39 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-mdl-42403' of https://github.com/rajeshtaneja/moodle

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 5af5a205a366aa26f260b2a7fbbf492433958c7b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Nov 2013 10:39:33 +0800
Tag:    v2.6.1

Merge branch '42060-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE

commit 84cd1a2a9121d91b95013b6b2a6aaa0e831c1a98
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Nov 2013 10:39:30 +0800
Tag:    v2.7.0-beta

Merge branch '42060-27' of git://github.com/samhemelryk/moodle

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 2a0a33a6ee652f50e63fc773d470df0ff6905fbc
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Nov 2013 10:30:16 +0800
Tag:    v2.7.0-beta

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

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

Merge branch 'MDL-42181_24' of git://github.com/mkassaei/moodle into MOODLE_24_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 0cf4e15baf75808669f563776dbdca248bd682d9
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Nov 2013 10:04:59 +0800
Tag:    v2.7.0-beta

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

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 f7a061c2c17d8d6a80c9b950c6101eb3cd3651f4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Nov 2013 15:38:50 +0800
Tag:    v2.4.8

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

commit 66a02845e942d19ba2da8aa304dd3a2529898a76
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Nov 2013 15:37:01 +0800
Tag:    v2.7.0-beta

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

commit b6813d8f6aff2f24782c1679899c561dfa234576
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Nov 2013 14:41:06 +0800
Tag:    v2.7.0-beta

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

commit 728f924ec140a9095bcf335a40bf2607f3b54fd3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Nov 2013 14:32:55 +0800
Tag:    v2.7.0-beta

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

commit 904f5815c709422a1f94d889cedc3a808b434944
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Nov 2013 14:30:50 +0800
Tag:    v2.6.1

Merge branch 'MDL-42930-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE

commit 46af0399258ff51c6a78026bcffd30b24d540f43
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 08 Nov 2013 16:08:20 +0800
Tag:    v2.6.0-rc1

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

commit dbb68d77794969a7ea7cc42ee55b3afb9ff6d98a
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 08 Nov 2013 16:05:06 +0800
Tag:    v2.6.0-rc1

Merge branch 'wip-mdl-42777' of https://github.com/rajeshtaneja/moodle

commit d06d812c51fb0cb14c24945cdcea8351ab25ffbc
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 08 Nov 2013 15:32:11 +0800
Tag:    v2.6.0-rc1

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

commit 379cbb459aa84c3970cba2098dd1ce78c3599ff7
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 08 Nov 2013 11:11:28 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42704-master' of git://github.com/jamiepratt/moodle

commit 0967c74a3d82d5921f766a333a2504aff1c778ee
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 07 Nov 2013 17:21:54 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42737-master' of git://github.com/andrewnicols/moodle

commit 48fe93fa26e76d7b7f0791fe2b38ae503b78819f
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 07 Nov 2013 17:17:32 +0800
Tag:    v2.6.0-rc1

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

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 b74c8389b1fe7cd6f3ded2d8f7dfa84c2fa92800
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 07 Nov 2013 14:19:14 +0800
Tag:    v2.6.0-rc1

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

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 d4308dff593885c009a577c7671bc15defe2581f
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 07 Nov 2013 11:58:46 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42628_b' of https://github.com/rwijaya/moodle

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

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

commit 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 f6a2a36bcd97d2750f8b6aba65e9be70b04c3c84
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 07 Nov 2013 11:44:01 +0800
Tag:    v2.6.0-rc1

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

commit 57d14266a8287d30730116e0407144aeaa6ca087
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 07 Nov 2013 11:23:11 +0800
Tag:    v2.6.0-rc1

Merge branch 'wip-mdl-42692' of https://github.com/rajeshtaneja/moodle

commit 0b353ee03e55eb943722e51cdd2b40ba5384e2dd
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 07 Nov 2013 11:19:15 +0800
Tag:    v2.6.0-rc1

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

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

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

commit 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 02c6bd358f98404e0ff4f4a99fe0dd5b06f537ad
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 07 Nov 2013 09:34:31 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42728-en_fix' of git://github.com/mudrd8mz/moodle

commit dc08bfe55845ea9df917614f23986229dbf271ef
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 06 Nov 2013 15:04:20 +0800
Tag:    v2.6.0-rc1

Merge branch '42628-26' of git://github.com/samhemelryk/moodle

commit 61bac37cf136f557571aa7ea0f27c8346d6e28c6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Nov 2013 17:25:53 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42332-fix-modal-window' of git://github.com/dmonllao/moodle

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

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

commit 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 bd706fb5901bd0943d7a2f4ce530d6c61da68440
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Nov 2013 16:39:27 +0800
Tag:    v2.6.0-rc1

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

commit 8d81bd5d1e32b3b90f6f9f5d6c4cb0f0710297e3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Nov 2013 15:52:48 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42363-fix-redirect-issue' of git://github.com/dmonllao/moodle

commit e957dfa549679ecc69b205a5ce4f6522a8509539
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Nov 2013 15:06:36 +0800
Tag:    v2.6.0-rc1

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

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 6ce30a3e2c26bdd9bab25a00388f1c1a10225f53
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Nov 2013 12:34:35 +0800
Tag:    v2.6.0-rc1

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

commit 0fe02089a42ae771f43dca36d3b4a7ebc8737afe
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Nov 2013 11:24:02 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42476' of https://github.com/srynot4sale/moodle

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 24a922e95301027ac02485fafbf13037f7a3aa22
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 23:40:33 +0800
Tag:    v2.6.0-rc1

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

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 dcc08e55b5df5855de2291c4e1e98b8ce3966c64
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 23:34:18 +0800
Tag:    v2.6.0-rc1

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

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

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

commit 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 a28c6b440e5fa5604406fd6deb15c7a366138627
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 22:54:09 +0800
Tag:    v2.6.0-rc1

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

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

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

commit 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 5e70fc1f9c6234b6a1edbd779e02147042c4a10a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 22:34:27 +0800
Tag:    v2.6.0-rc1

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

commit efe938fca59a2c1a5d7e3af1cede182aa95d95e5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 22:31:55 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42464-master' of git://github.com/andrewnicols/moodle

commit 4a17894ac543bc93748ad67b7716d99b5747884c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 22:27:49 +0800
Tag:    v2.6.0-rc1

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

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

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

commit 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 2c7b23a23988fbc2a35332e16c826511201cbd8e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 22:17:19 +0800
Tag:    v2.6.0-rc1

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

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

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

commit 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 07ba528bd426ccb5afbc978ef2eec202a176ba96
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 21:51:57 +0800
Tag:    v2.6.0-rc1

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

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 6db9f41419dcef8b5be301383149deea1660e7a8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 20:10:24 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42355_editpdf_deselect_comment' of git://github.com/davosmith/moodle

commit 22379484fd40e1164cf563d184f0506324513ec1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 19:35:01 +0800
Tag:    v2.6.0-rc1

Merge branch 'wip-mdl-41849' of https://github.com/rajeshtaneja/moodle

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 dcb6e4169b6959e0b7b3a010cd00bd9a1a7e00b5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 17:21:32 +0800
Tag:    v2.4.7

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

commit 81da82f5f3199541ad1e0ab910bae1a0ce1cb516
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 17:21:29 +0800
Tag:    v2.6.0-rc1

Merge branch '42350-26' of git://github.com/samhemelryk/moodle

commit 28cc8d4b43fb2eece42fd8207effa52b1997cc34
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 16:39:39 +0800
Tag:    v2.6.0-rc1

Merge branch 'wip-mdl-42537' of https://github.com/rajeshtaneja/moodle

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

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

commit 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 71fbce44106f41549d5d027857a42c963f588cbd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 16:21:25 +0800
Tag:    v2.6.0-rc1

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

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 db6767ae475d28bb76ba589fa1a62785e86231a3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 16:14:04 +0800
Tag:    v2.6.0-rc1

Merge branch 'w45_MDL-42044_m26_zipaddon' of https://github.com/skodak/moodle

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 466fa368b58665d2e615beb42609f417ca5fd6f2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 15:32:34 +0800
Tag:    v2.6.0-rc1

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

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

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

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

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

commit 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 b763a03ddbde5bda52a7021385b76a2b2ed839cf
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 14:51:16 +0800
Tag:    v2.6.0-rc1

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

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 fa5b21216f4cb8db74e698a2938a21cdd4e47aeb
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 14:13:27 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42286_behat' of https://github.com/andyjdavis/moodle

commit 9261a3b0d109b79901d2b9925131fac70c32c34f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 12:30:12 +0800
Tag:    v2.6.0-rc1

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

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

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

commit 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 92dc72a6b56d0e424398a1799fc11c6bd96fcd71
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Nov 2013 12:10:39 +0800
Tag:    v2.6.0-rc1

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

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 54173d418037242437c2897b2a5f150ee4fd1b30
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 01 Nov 2013 17:31:17 +0800
Tag:    v2.6.0-rc1

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

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 eef875e0c147c796b678b093ae361b0badf85cdf
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 01 Nov 2013 15:47:42 +0800
Tag:    v2.4.7

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

commit 54c236dff851f148973e7c7ce35c4082dd789faf
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 01 Nov 2013 15:47:37 +0800
Tag:    v2.3.10

Merge branch 'install_23_STABLE' of git://git.moodle.org/moodle-install into MOODLE_23_STABLE

commit 4c3b5e6e1ff3c43b6ed654d59e69fc2689b0778a
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 01 Nov 2013 15:47:31 +0800
Tag:    v2.6.0-rc1

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

commit e3944841797736dc19a06dd8d4ed927bd76f29b9
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 31 Oct 2013 18:38:25 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42102-master' of git://github.com/andrewnicols/moodle

commit 3dc774b8efc5547a3005718afa1d6150d033276e
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 31 Oct 2013 12:20:38 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42517-m' of git://github.com/micaherne/moodle

commit d61d4c1bf692f42e538cb53cb7d2cace7cbc4101
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 31 Oct 2013 12:14:50 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42482_editpdf_blank_comments' of git://github.com/davosmith/moodle

commit fcdc58897600b10b93a89917b7ba9b95c75ab7b5
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 31 Oct 2013 11:54:07 +0800
Tag:    v2.6.0-rc1

Merge branch 'wip-mdl-42594' of https://github.com/rajeshtaneja/moodle

commit 9b0cc9ddf2bfc99245ea264b80f42cc9361994b9
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 31 Oct 2013 11:48:00 +0800
Tag:    v2.6.0-rc1

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

commit fc74cc8238d679d50843042bdebd64164ef787b6
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 31 Oct 2013 11:27:49 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42352_editpdf_scrolling' of git://github.com/davosmith/moodle

commit e9b7148ba7c7256775044c5d674211b350898cd9
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 31 Oct 2013 10:56:45 +0800
Tag:    v2.6.0-rc1

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

commit 51bd152e34b21f4c295aba25e799367548dc1784
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 31 Oct 2013 10:08:23 +0800
Tag:    v2.6.0-rc1

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

commit d7052f748bdac5a43bf730f49984172a3a8886ed
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 30 Oct 2013 17:24:06 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42102-master' of git://github.com/andrewnicols/moodle

commit d147e833c0000c7f357aadb211440373684104ee
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Oct 2013 17:28:25 +0800
Tag:    v2.6.0-rc1

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

commit 576abe8f3979ef090ff8687d4773be512b87967a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Oct 2013 15:08:13 +0800
Tag:    v2.6.0-rc1

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

commit c966d2e8c8114d45c961c0d9400a2327133b3a1d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Oct 2013 15:03:52 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42528' of https://github.com/merrill-oakland/moodle

commit 6cd49ef747be0a3be03483f2a1b4cd4ef6ea51a5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Oct 2013 14:54:44 +0800
Tag:    v2.6.0-rc1

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

commit 76aa53f2d8e2b05cdcf92fd44cacef5568492514
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Oct 2013 14:48:27 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42507-master' of git://github.com/andrewnicols/moodle

commit c426631850583777f1f93e4e159ff7f4ad798d65
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Oct 2013 14:43:02 +0800
Tag:    v2.6.0-rc1

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

commit d3428bc93af7005ec5930bac6ffeccf7a430ff30
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Oct 2013 13:42:56 +0800
Tag:    v2.6.0-rc1

Merge branch 'w44_MDL-42485_m26_memcachedlocktimeout' of https://github.com/skodak/moodle

commit 7d3cdcc90dfbfd5aaead289c24b741b5bfb4a9b9
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Oct 2013 13:16:44 +0800
Tag:    v2.6.0-rc1

Merge branch 'wip-mdl-42557' of https://github.com/rajeshtaneja/moodle

commit b6df9f8f557d49d68be04669c2b93207aec3ba03
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Oct 2013 13:09:23 +0800
Tag:    v2.6.0-rc1

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

commit e29dcc5a5b69ab2670c83e2ab8af72dfdca2f4bf
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Oct 2013 12:10:44 +0800
Tag:    v2.6.0-rc1

Merge branch 'wip-mdl-42556' of https://github.com/rajeshtaneja/moodle

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 b0d92c0cec3dd85704db368cd9e2d0a3857c6937
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Oct 2013 11:31:32 +0800
Tag:    v2.6.0-rc1

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

commit 0e9b07697366774bbb8cf28b9a1b8a679ce386f0
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Oct 2013 11:08:45 +0800
Tag:    v2.6.0-rc1

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

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 0bc96042122d21e252754b8531e20573cf41f3cd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Oct 2013 16:31:38 +0800
Tag:    v2.4.7

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

commit 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 4daa024fd419e78fea87cb702ea308d0b27622eb
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Oct 2013 16:31:17 +0800
Tag:    v2.6.0-rc1

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

commit b1a6c9dc5253d1666659c86260747b965bf9998b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Oct 2013 15:37:05 +0800
Tag:    v2.6.0-rc1

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

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 10ac20830b620d9856f47555e2aa10d85f9bc5d6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Oct 2013 14:53:21 +0800
Tag:    v2.6.0-rc1

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

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 ff1ec8b50fb040891ae90c0fc0e5192076a47956
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Oct 2013 14:15:27 +0800
Tag:    v2.6.0-rc1

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

commit f76bd72234484462f85488205199c77a809862af
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Oct 2013 12:33:39 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-38419' of https://github.com/moodlerooms/moodle

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 bdbca0949f1b4223b8ec3291fe61317d391c9332
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Oct 2013 11:35:54 +0800
Tag:    v2.6.0-rc1

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

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

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

commit 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 96d0198b8acec63cfe85d6cd61a164f6db2888e8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Oct 2013 11:21:26 +0800
Tag:    v2.6.0-rc1

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

commit 4baf482daa4b6d652a3c6d18c8561f1852634c39
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Oct 2013 11:10:43 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-41504-master' of git://github.com/andrewnicols/moodle

commit 92fbc0de262a9a6bacb67739a0c9657c7927e8a8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Oct 2013 10:51:44 +0800
Tag:    v2.6.0-rc1

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

commit c713639b65296b9f570194c2123c39b3e71608e1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Oct 2013 10:43:07 +0800
Tag:    v2.6.0-rc1

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

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 534c356a876770ffd0a1c7b1a25fe8d96a9ae3b3
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 Oct 2013 15:55:27 +0800
Tag:    v2.6.0-rc1

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

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 3e2b1a15aa34a822cd0cab4d67b98451ca4f280f
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 Oct 2013 15:27:48 +0800
Tag:    v2.6.0-rc1

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

commit d62cddc5695204894ee1ad633b4714316bbfac63
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 Oct 2013 13:47:00 +0800
Tag:    v2.6.0-rc1

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

commit b2d08cad469f884aa965fbed8379a0d97b7151c4
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 Oct 2013 12:42:38 +0800
Tag:    v2.6.0-rc1

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

commit cf49c1b6421d20060ebaa8deb45397ff55c65161
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 Oct 2013 12:39:37 +0800
Tag:    v2.6.0-rc1

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

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 6356be73d03b6fb9686e915ec67dcd8116d4090c
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 Oct 2013 11:33:19 +0800
Tag:    v2.6.0-rc1

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

commit eb04bc4a866d1f6e40ceaabefd358aa81f9be65a
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 Oct 2013 10:05:55 +0800
Tag:    v2.6.0-rc1

Merge branch 'w43_MDL-42381_m26_ole' of https://github.com/skodak/moodle

commit e36f72414dbb49256dab4e8515fe69943ffa949e
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Oct 2013 16:57:47 +0800
Tag:    v2.6.0-rc1

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

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

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

commit 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 3f9a9e86b334523d4c4182a8bb98471e4e55d128
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Oct 2013 16:28:46 +0800
Tag:    v2.6.0-rc1

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

commit 5ab04db3564f0d5ffe13cea615a2d011ecc0c7be
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Oct 2013 16:15:24 +0800
Tag:    v2.6.0-rc1

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

commit 76dcc0ee21bae61565a1ac619fcb887e3eb24e78
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Oct 2013 16:07:17 +0800
Tag:    v2.6.0-rc1

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

commit 680d9052ad7a2c90e6ba03c8efc2ec51f7b51e78
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Oct 2013 15:55:52 +0800
Tag:    v2.6.0-rc1

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

commit 012b0472c5f5e21dbaaa5baf6cfb7ff5c60596bd
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Oct 2013 15:47:48 +0800
Tag:    v2.6.0-rc1

Merge branch '42299-26' of git://github.com/samhemelryk/moodle

commit c6dd6d2eb793c9df1cd1bdd9407ef7a35962d3e6
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Oct 2013 15:15:07 +0800
Tag:    v2.6.0-rc1

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

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 2d2c5f36c4c8ae28ede29803f2bff2f0fe6bb775
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Oct 2013 12:43:52 +0800
Tag:    v2.6.0-rc1

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

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 205d507f87a4aa063f30d4c16272833c8bb0fa6f
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Oct 2013 12:39:38 +0800
Tag:    v2.6.0-rc1

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

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 f76c87151fa372ffc4543ef61e10a29b7c48fe93
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Oct 2013 12:33:15 +0800
Tag:    v2.6.0-rc1

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

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 93488d8bb01473085244ef4c29fe70a2096583ab
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Oct 2013 10:27:23 +0800
Tag:    v2.6.0-rc1

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

commit 459dbd43622d58cf5b96bf4a7c310d514fc3c6ae
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Oct 2013 10:19:47 +0800
Tag:    v2.6.0-rc1

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

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 b8a5092f2ed8355b7b2609181bec7644de2bd026
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Oct 2013 15:26:54 +0800
Tag:    v2.6.0-rc1

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

commit 276c451b2a915b619bbd9405a28cc54be2e85110
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Oct 2013 15:12:22 +0800
Tag:    v2.6.0-rc1

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

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 0f136c1a5b04c3be3d0adab1eda478cbd756cc39
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Oct 2013 14:36:07 +0800
Tag:    v2.6.0-rc1

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

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 40f0a3abed43715a4d89f7f3241857742edfc885
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Oct 2013 13:20:08 +0800
Tag:    v2.6.0-rc1

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

commit 8c8a844f2bb5dfcde1e84ab7526a60d1e1455256
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Oct 2013 13:18:45 +0800
Tag:    v2.6.0-rc1

Merge branch '42277-26' of git://github.com/samhemelryk/moodle

commit d0041fb110201d3dc1a4546eca8b6108b440d1c5
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Oct 2013 13:15:48 +0800
Tag:    v2.6.0-rc1

Merge branch 'w43_MDL-38743_m26_private' of https://github.com/skodak/moodle

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 de3d8fda10d57c34297cd4b2641293e5c63a2456
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Oct 2013 12:37:45 +0800
Tag:    v2.6.0-rc1

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

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

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

commit 174df12acb297d68fa09e943394cee458931dca2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Oct 2013 20:51:30 +0800
Tag:    v2.6.0-rc1

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

commit 8c3ebb1a9fd37c3387585c264ebcf57c87313166
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Oct 2013 17:54:10 +0800
Tag:    v2.6.0-rc1

Merge branch 'w43_MDL-42440_m26_authenable' of https://github.com/skodak/moodle

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

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

commit 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 2d79065013bb6e7d13410511a1737b86fa17faf6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Oct 2013 16:29:59 +0800
Tag:    v2.6.0-rc1

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

commit 6f4747d7b42136a56927071d0d57562912c4f305
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Oct 2013 15:16:08 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42340-master' of git://github.com/andrewnicols/moodle

commit d4256630e75c3039637386d6de83a01287c7ebb1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Oct 2013 15:02:05 +0800
Tag:    v2.6.0-rc1

Merge branch '40976-26' of git://github.com/samhemelryk/moodle

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

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

commit 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 a8261e2830067c74dd5279145dba15c485572285
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Oct 2013 13:19:27 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-29441-master' of git://github.com/andrewnicols/moodle

commit 0c7c5e767c852a5633cde8b22a13ccebe795e8c5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Oct 2013 13:09:31 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42115-master' of git://github.com/jamiepratt/moodle

commit 616e57d92690725b29772646df8fda45513e76aa
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Oct 2013 13:00:23 +0800
Tag:    v2.6.0-rc1

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

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 59dca9505b7108196f20bf3828c1a65924bc0192
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Oct 2013 11:52:26 +0800
Tag:    v2.6.0-rc1

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

commit 181b0b3c3e4c2c17bd91fb12553b9247f32f461f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Oct 2013 11:51:03 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42117-master' of git://github.com/andrewnicols/moodle

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

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

commit 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 b750557ba0f82cf9a80c23d75f105960ac71e22e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Oct 2013 10:25:44 +0800
Tag:    v2.6.0-rc1

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

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

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

commit 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 9c5ab08e5a73d8425adfdb441063d80b164871b9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Oct 2013 13:58:14 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-34209-master' of git://github.com/andrewnicols/moodle

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

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

commit 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 2d0316d60de95a59e700345b84515b5204b1f968
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Oct 2013 11:24:51 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-26244_url' of https://github.com/andyjdavis/moodle

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 f381eede5157da1b7f6c72bb6e642557890f729a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Oct 2013 11:15:21 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42408_master' of https://github.com/dmonllao/moodle

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

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

commit 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 fb032ccb3f4652dc87a7c33fe66a556f31660d83
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Oct 2013 10:57:44 +0800
Tag:    v2.6.0-rc1

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

commit 8173f4cf017dd6c7074ebfe4168d890c6e9e80ef
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Oct 2013 08:56:46 +0800
Tag:    v2.6.0-rc1

Merge branch 'w43_MDL-42438_m26_yuicss' of https://github.com/skodak/moodle

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 6123c76bc73156b1e4736d939f8b443db929a174
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Oct 2013 16:16:34 +0800
Tag:    v2.4.7

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

commit 898247045206e1d215186dcd601f8992850f2d45
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Oct 2013 16:16:11 +0800
Tag:    v2.6.0-beta

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

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

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

commit 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 c68bf34f83b024570127306ba049d47c9c215dd9
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 17 Oct 2013 16:29:05 +0800
Tag:    v2.6.0-beta

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

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

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

commit 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 bca2951282db9e7cb38e98cf2b978ed6283c2e6e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Oct 2013 14:43:02 +0800
Tag:    v2.6.0-beta

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

commit e3aa1fa929986f89a41b8a8bdaad7ad129a2f375
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Oct 2013 11:53:26 +0800
Tag:    v2.6.0-beta

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

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 bd81762784a3b5147b64a0cb9e5a8c56bd8c101f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Oct 2013 09:32:27 +0800
Tag:    v2.6.0-beta

Merge branch '42247-26' of git://github.com/samhemelryk/moodle

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 c79239b2947ed6a8a32ed684cea31e3793ac64c7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Oct 2013 16:11:50 +0800
Tag:    v2.6.0-beta

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

commit 7159340f7fdcc776eb750dce21a3ead72a446400
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Oct 2013 15:46:22 +0800
Tag:    v2.6.0-beta

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

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

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

commit 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 7a1ce7769c1e57819c8f3520b33ae61cf5fb397f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Oct 2013 14:36:14 +0800
Tag:    v2.6.0-beta

Merge branch 'w42_MDL-42082_m26_authdbpass' of https://github.com/skodak/moodle

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

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

commit 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 7bed57ae1f35d5d9a692722d1755b92a007b1122
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Oct 2013 14:24:02 +0800
Tag:    v2.6.0-beta

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

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

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

commit 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 b011a17b2607b91ec85995b6d15f2ee574d9ecc5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Oct 2013 12:11:23 +0800
Tag:    v2.6.0-beta

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

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 b1bdb61e90eac838640af0a8d7a3cb21fd40d7ad
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Oct 2013 12:07:54 +0800
Tag:    v2.6.0-beta

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

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 00ae230f526ee65218f373c27669d32b3adeeaa6
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 10 Oct 2013 10:31:44 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41379_outcomes' of https://github.com/andyjdavis/moodle

commit e077f21827c2c333ddd6bfd533dcccd4634965f8
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 10 Oct 2013 08:18:28 +0800
Tag:    v2.6.0-beta

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

commit c08f914799217c8735aa40f4fc0990c2dbd2a682
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 10 Oct 2013 07:20:18 +0800
Tag:    v2.6.0-beta

Merge branch '42057-26' of git://github.com/samhemelryk/moodle

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

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

commit 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 54cd84c84bdab444c3057421f854162593da23bd
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Oct 2013 18:16:56 +0800
Tag:    v2.6.0-beta

Merge branch 'w41_MDL-42054_m26_phpmailertesting_i' of https://github.com/skodak/moodle

commit f57053fc2a31cdc945601766214231dfa4223263
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Oct 2013 17:23:44 +0800
Tag:    v2.6.0-beta

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

commit c1636aea88582f0b06667245bae05d22be97a067
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Oct 2013 17:01:10 +0800
Tag:    v2.6.0-beta

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

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

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

commit 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 117111b78b6c4b5969ac15e3f5fb8dd7ce98d4ee
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Oct 2013 16:54:02 +0800
Tag:    v2.6.0-beta

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

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

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

commit 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 07b0214588ddd0753aeea7c7bda365335196d42f
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Oct 2013 16:46:56 +0800
Tag:    v2.6.0-beta

Merge branch 'm26_MDL-40226_Add_JNLP_MIME_Type_Support' of https://github.com/scara/moodle

commit bbe834a152bd00b2a0657e276e20f2ee85b5371c
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Oct 2013 16:28:53 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41986-master' of git://github.com/andrewnicols/moodle

commit c58b3ca0ca56a42f7974af4bcd505b3e4d2eae8f
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Oct 2013 16:27:50 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41985-master' of git://github.com/andrewnicols/moodle

commit e521e0724e3f8ed55aaf0ba50d832e5590c2ad49
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Oct 2013 11:16:34 +0800
Tag:    v2.6.0-beta

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

commit e9091a28f5e5f9066f5b6c552b48cd87059ac423
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Oct 2013 10:54:24 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-42089-master' of git://github.com/abgreeve/moodle

commit 9d841c6c90985c2e00f025d06b14716a1c372bed
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Oct 2013 10:27:07 +0800
Tag:    v2.6.0-beta

Merge branch 'mdl41908-master' of https://github.com/tlock/moodle

commit 4f0eaf18f42a9ff8e11118b7f04195479ba10169
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Oct 2013 16:42:17 +0800
Tag:    v2.6.0-beta

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

commit b56a6981b330a83fa321b6ee1564ea67fbfa3017
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Oct 2013 15:19:09 +0800
Tag:    v2.6.0-beta

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

commit bcb3c375e3daa99fcfe361d8b1fda828dfe81d46
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Oct 2013 14:33:27 +0800
Tag:    v2.6.0-beta

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

commit fa96fb0cea39de729267be4e63dc1d28d8cc1a9f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Oct 2013 13:33:25 +0800
Tag:    v2.6.0-beta

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

commit 8431c290fd9946df506a1dac63f57062ba2acd88
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Oct 2013 13:25:12 +0800
Tag:    v2.6.0-beta

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

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

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

commit 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 6cd7df4df1749a9d937b047e76fba1042574d2ee
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Oct 2013 13:21:30 +0800
Tag:    v2.6.0-beta

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

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 d1050e406f0262eed1f00536ae568ce89adc6182
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Oct 2013 11:26:37 +0800
Tag:    v2.6.0-beta

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

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

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

commit 261dc01734364af69ce551ee8ac2f8aa56787e1b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 17:35:40 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40733_forum_name' of https://github.com/andyjdavis/moodle

commit 50d7cc8463c43946ae683e3e51d6aa50ecc5146f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 17:30:04 +0800
Tag:    v2.6.0-beta

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

commit 89cb942c6d19595274e4fd5594baff4dd8803e59
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 17:14:40 +0800
Tag:    v2.6.0-beta

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

commit 62b35d5852b4e70ca7b2f9c49d2ae47bb25e3144
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 16:00:52 +0800
Tag:    v2.6.0-beta

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

commit c219df86d1fd9b9721dff320f2534bbadf4dd607
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 15:29:23 +0800
Tag:    v2.6.0-beta

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

commit 4bdabf596826f98082e2b4b67d8942324a58f385
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 15:21:49 +0800
Tag:    v2.6.0-beta

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

commit f2ee9b5c27931688c8f6360d5b81f203af240dad
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 14:58:54 +0800
Tag:    v2.6.0-beta

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

commit 92d92606baa9911df412e750fb604dc6254269eb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 14:33:41 +0800
Tag:    v2.6.0-beta

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

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

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

commit 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 03608c253da0b53c37a342230c934be4fe940430
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 14:25:48 +0800
Tag:    v2.6.0-beta

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

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

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

commit 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 f07c2243b1f183a3b9010b350385efd2f20cd537
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 14:12:14 +0800
Tag:    v2.6.0-beta

Merge branch '41189-26' of git://github.com/samhemelryk/moodle

commit e025a2fc43455ccef662f8e8abd1159e72902a17
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 13:39:01 +0800
Tag:    v2.6.0-beta

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

commit f7e719eb38a2c6179738c9ed58abe6bb05798b1a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 13:23:47 +0800
Tag:    v2.6.0-beta

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

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

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

commit 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 840bbc1b645c6dd640de5d4baedd4d0e46ca1e6f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 12:04:51 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-28561_M26' of git://github.com/lazydaisy/moodle

commit f841aa780d4254dde7ae3d2ccb4245960f2afa57
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 11:13:29 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-38570-master' of https://github.com/timgus/moodle

commit 30d6c394e2a45b0b633a51c2a78c21d307e80de6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Sep 2013 10:27:59 +0800
Tag:    v2.6.0-beta

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

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

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

commit 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 0df3254212be90e5b2382ccdc2c02bcc825bb2af
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Sep 2013 18:04:05 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41254-m' of git://github.com/micaherne/moodle

commit cdf6fc243e666fe3b0893606d84457bc1eea9dbb
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Sep 2013 17:37:49 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-29069' of https://github.com/bostelm/moodle

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

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

commit 8eb80a2c425a53877513abe869df09c8be00bfd7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Sep 2013 17:13:22 +0800
Tag:    v2.6.0-beta

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

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

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

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 867af9c4f3a310c0662e456bc318f0a4703bfe6d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Sep 2013 15:29:48 +0800
Tag:    v2.6.0-beta

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

commit 76c88eaffb6047ec34abbf419059a433f1944715
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Sep 2013 14:23:41 +0800
Tag:    v2.6.0-beta

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

commit d95e8420df1675abf7a7cb48ef78a6a405450d8a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Sep 2013 10:22:02 +0800
Tag:    v2.6.0-beta

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

commit 29d5e81473ff2e2a6ef909f8fb9b6c208eaf44b3
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 05 Sep 2013 14:43:53 +0800
Tag:    v2.3.9

Merge branch 'install_23_STABLE' of git://git.moodle.org/moodle-install into MOODLE_23_STABLE

commit fe38aff3a71e0d937393a1cbd16c0c2bd548cace
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 05 Sep 2013 14:43:39 +0800
Tag:    v2.4.6

Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_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 ba7b843c018b3119e907d8c38c6ebfb736e86c6f
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 05 Sep 2013 14:42:31 +0800
Tag:    v2.6.0-beta

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

commit 0de0e38bc428c3efe0f42b59dbbcd40b0becb1ca
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 05 Sep 2013 10:34:11 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-41369-fix2' of git://github.com/marinaglancy/moodle

commit bc16c7a0e3bf7ee41a1ce6bddae4ee6843b96c13
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 04 Sep 2013 16:59:20 +0800
Tag:    v2.6.0-beta

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

commit 259dfc252178d2b7ac642d69e4ac6409c4b848b0
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 04 Sep 2013 11:09:30 +0800
Tag:    v2.6.0-beta

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

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

Merge branch 'wip-mdl-41418-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_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 7e2a4e1638806cbae9ec38025c7315801fbe4590
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 04 Sep 2013 10:38:10 +0800
Tag:    v2.6.0-beta

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

commit 4f9c5f332b61af564de64f3d0deb8ec4c72b0c7a
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 04 Sep 2013 10:33:33 +0800
Tag:    v2.6.0-beta

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

commit 1f34b19a3355558a0e98a3f1d22918f530d8e97e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Sep 2013 16:05:38 +0800
Tag:    v2.6.0-beta

Merge branch 'mdl41304-master' of git://github.com/tlock/moodle

commit 5c1ba238d2671232c4fcc1222d957cf90aefe06a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Sep 2013 14:10:02 +0800
Tag:    v2.6.0-beta

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

commit da337c3f3969654518726be154e96414669831b8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Sep 2013 12:59:04 +0800
Tag:    v2.4.6

Merge branch 'w36_MDL-41255_m24_changepw' of https://github.com/skodak/moodle into MOODLE_24_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 f3549a51a76c6f73fd065185350f400c4dd0acc3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Sep 2013 12:58:27 +0800
Tag:    v2.6.0-beta

Merge branch 'w36_MDL-41255_m26_changepw' of https://github.com/skodak/moodle

commit ef103c84bb1a916aeaa5c5658a1e1f2dcff80712
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Sep 2013 12:31:12 +0800
Tag:    v2.4.6

Merge branch 'MDL-41428-24' of git://github.com/FMCorz/moodle into MOODLE_24_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 c247756b0ca5fc8985e26fa0d7d6cb5124a55efd
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Sep 2013 12:27:26 +0800
Tag:    v2.6.0-beta

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

commit d65c2e5d44c1f31924ee9e1dff3271331b12d9c9
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Sep 2013 11:49:07 +0800
Tag:    v2.4.6

Merge branch 'wip-MDL-41179-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_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 4ffd70f3153821298aa5914845a4273b68c1f717
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Sep 2013 11:48:45 +0800
Tag:    v2.6.0-beta

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

commit c6569641e7c4ea98f13bc6a3b9206f4df1150499
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Sep 2013 10:51:27 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41256-master' of https://github.com/mackensen/moodle

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

Merge branch 'wip-MDL-41317-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_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 29db803ac783acb8cc1890f559bacab7bb120b62
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Sep 2013 10:40:28 +0800
Tag:    v2.6.0-beta

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

commit e8bc65a85e13970a206c989ed39db99f06cd8fa8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Sep 2013 10:07:08 +0800
Tag:    v2.4.6

Merge branch 'MDL-40214_m24' of https://github.com/markn86/moodle into MOODLE_24_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 2b1e887561602af20384d18e921ab64b14a0df61
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Sep 2013 10:06:38 +0800
Tag:    v2.6.0-beta

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

commit 6affe9e695605af00e578f0082164e2734219c30
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Sep 2013 09:53:22 +0800
Tag:    v2.6.0-beta

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

commit ee0be46957714e4c73f9b4f17c9d9d29d44aadfd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Sep 2013 17:32:08 +0800
Tag:    v2.6.0-beta

Merge branch '41214-26' of git://github.com/samhemelryk/moodle

commit ed016dd8fcb08c3f7fa9b51354985b395ef886f5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Sep 2013 17:25:46 +0800
Tag:    v2.4.6

Merge branch 'MDL-41149-24' of git://github.com/damyon/moodle into MOODLE_24_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 56b9e0b5653972b8bc3a6ec43e40159594c43d3c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Sep 2013 17:25:27 +0800
Tag:    v2.6.0-beta

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

commit 53d9e41bb9173e8c59699d4ef4db5c8fa848e3c4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Sep 2013 17:22:14 +0800
Tag:    v2.6.0-beta

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

commit f1b10b36ea0db97e8dbf5e5965e77b26ee79f843
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Sep 2013 16:27:46 +0800
Tag:    v2.6.0-beta

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

commit 4abcb5c5e26d3572cb28e53bede2e636d90ce6fa
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Sep 2013 16:21:48 +0800
Tag:    v2.6.0-beta

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

commit afe1dde0c8e23a89b016c3be909813a12a76e6f8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Sep 2013 15:24:33 +0800
Tag:    v2.4.6

Merge branch 'MDL-35925-24' of git://github.com/phalacee/moodle into MOODLE_24_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 6b25e62f4886c840e93fff64845f48f87a680e09
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Sep 2013 15:23:05 +0800
Tag:    v2.6.0-beta

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

commit 5a407be1d4088859ca76216cc98c9bcd5e8f099c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Sep 2013 14:11:05 +0800
Tag:    v2.4.6

Merge branch 'MDL-36093-moodle24' of github.com:StudiUM/moodle into MOODLE_24_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 597229244452356dd1aa392518ceccae96ce75dc
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Sep 2013 14:10:28 +0800
Tag:    v2.6.0-beta

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

commit 370f95edf0e0732eb449c6673ea7b24cce7507e4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Sep 2013 11:53:00 +0800
Tag:    v2.4.6

Merge branch 'MDL-41175_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_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 fff084b29f7cff39127f7037733a1a55467f70d9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Sep 2013 11:50:38 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41175_M26' of git://github.com/lazydaisy/moodle

commit 79dc70d99c066e3484b3ba3b3430ab86099d51ed
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Sep 2013 11:45:08 +0800
Tag:    v2.4.6

Merge branch 'MDL-41328-24' of git://github.com/damyon/moodle into MOODLE_24_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 70189e7ad2022844f4d8775f10b1a013e5ffd79f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Sep 2013 11:44:51 +0800
Tag:    v2.6.0-beta

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

commit 575c57df0af3710f0e774596a769678e336922a5
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 29 Aug 2013 10:15:47 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39682_master' of https://github.com/nadavkav/moodle

commit d9cf3ca0b0da1c858f0832b1ebb6764d522a590f
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 28 Aug 2013 10:00:46 +0800
Tag:    v2.6.0-beta

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

commit 7d64b40db1633989c9ae34dca08d5767ff10dcf7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Aug 2013 18:09:54 +0800
Tag:    v2.4.6

Merge branch 'MDL-41366_24' of git://github.com/timhunt/moodle into MOODLE_24_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 939320f72177120a35c380d208294e3531487aad
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Aug 2013 18:09:34 +0800
Tag:    v2.6.0-beta

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

commit d76cb8ee26a5425aa91b89cac7bf8e923dc82140
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Aug 2013 15:47:52 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39682_master' of https://github.com/nadavkav/moodle

commit 4436225eb14903b0d853b0b4f611d53c7f529447
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Aug 2013 15:06:38 +0800
Tag:    v2.6.0-beta

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

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 eb1526e059d50345710cc9b487cb40f479c0e13e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Aug 2013 14:06:54 +0800
Tag:    v2.6.0-beta

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

commit 4c37aadb326b6deba3b7941003b8e1ce756fe064
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Aug 2013 13:53:09 +0800
Tag:    v2.4.6

Merge branch 'MDL-38765_24' of git://github.com/timhunt/moodle into MOODLE_24_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 9a6c6d1cfd9e5d01cc9eb859fa963385791b260b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Aug 2013 13:51:40 +0800
Tag:    v2.6.0-beta

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

commit 80979f76eeea5422cdbda5d34f3d08c6bbc4dc6b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Aug 2013 13:47:39 +0800
Tag:    v2.6.0-beta

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

commit e820d50791ddced82f0d7e001bba32589cb3df71
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Aug 2013 11:54:28 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-37211_master' of https://github.com/nadavkav/moodle

commit 4acc7c01068068710f65475d7fc6155fd28c274c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Aug 2013 11:08:14 +0800
Tag:    v2.4.6

Merge branch 'wip-MDL-41222-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_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 67c6ab16464d37e10d91d9d5f88684ea9f006a9f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Aug 2013 11:03:35 +0800
Tag:    v2.6.0-beta

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

commit d1584b6165e3c77f0f453817f3a0ac6024a382d8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Aug 2013 10:57:09 +0800
Tag:    v2.6.0-beta

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

commit 02ebac0bf17eccb0dc39a61dbce7ffcf0d974fd6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Aug 2013 10:55:51 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-41419-master' of git://github.com/abgreeve/moodle

commit 0f567efc8fe1bac553c6fe0457e7f0d5edde3c88
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Aug 2013 18:07:11 +0800
Tag:    v2.4.6

Merge branch 'MDL-41291-24' of git://github.com/mr-russ/moodle into MOODLE_24_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 51eba172e68b14bfa0fbc7ba39eec62d8092b2c9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Aug 2013 17:50:08 +0800
Tag:    v2.6.0-beta

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

commit a0df83441b62bf246e4f84d7ce5582e0a82588ff
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Aug 2013 17:47:05 +0800
Tag:    v2.6.0-beta

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

commit aa8fe639370e8060f0ab2fde9dbff65d8589718a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Aug 2013 15:09:33 +0800
Tag:    v2.6.0-beta

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

commit ea6deb7e09c9b7cbb7c12400c42b8173df8b111e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Aug 2013 14:56:45 +0800
Tag:    v2.4.6

Merge branch 'MDL-35930_m24' of git://github.com/rwijaya/moodle into MOODLE_24_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 11b80a6044e4757ad409ce39de2276fbfa826d72
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Aug 2013 14:55:54 +0800
Tag:    v2.6.0-beta

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

commit 8f9e51417e6fc1c721f4d98826886a65e2e28e61
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Aug 2013 14:33:06 +0800
Tag:    v2.6.0-beta

Merge branch '40249-26' of git://github.com/samhemelryk/moodle

commit 433bba6b2f5ff6aec142939e97c367a1b74aa7e2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Aug 2013 14:25:42 +0800
Tag:    v2.4.6

Merge branch 'MDL-36126_m24' of https://github.com/markn86/moodle into MOODLE_24_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 ba59a28305209eb5bb7121030fca9abc0005cefd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Aug 2013 14:25:20 +0800
Tag:    v2.6.0-beta

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

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

Merge branch 'MDL-41249-24' of git://github.com/damyon/moodle into MOODLE_24_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 8ba9df5862d85f942d3780ab40eecbc9490659f1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Aug 2013 13:11:04 +0800
Tag:    v2.6.0-beta

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

commit 6c416558dae58eafdf1827e173aa3bddd8ae6408
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Aug 2013 12:23:16 +0800
Tag:    v2.6.0-beta

Merge branch 'w35_MDL-41022_m26_unittests3' of https://github.com/skodak/moodle

commit 17f8a9f75f143454e7e27d06ab34f4ed01130bfe
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 22 Aug 2013 11:18:10 +0800
Tag:    v2.4.6

Merge branch 'MDL-30839-24' of git://github.com/phalacee/moodle into MOODLE_24_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 52ef7502d6fbc5fcd6a103d04061a152ec78ca8b
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 22 Aug 2013 11:17:49 +0800
Tag:    v2.6.0-beta

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

commit c44ff50cbc1f9db5e0c0dea917c1867613c63664
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 22 Aug 2013 10:40:47 +0800
Tag:    v2.6.0-beta

Merge branch 'debugdeveloperbitwisemess' of git://github.com/skodak/moodle

commit d7d2f263ddc288da030ddcee7eb4646ec37301f5
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 22 Aug 2013 10:32:54 +0800
Tag:    v2.6.0-beta

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

commit 5689cb3a27628dd0c2ddc00376a24a4fffb81e87
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 22 Aug 2013 10:15:59 +0800
Tag:    v2.4.6

Merge branch 'MDL-30839-24' of git://github.com/phalacee/moodle into MOODLE_24_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 695969987a208ed402c034a614f514b4b87e8acf
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 22 Aug 2013 10:14:21 +0800
Tag:    v2.6.0-beta

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

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 915a6b411702322b5ae8b79499504f5bf397698e
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 22 Aug 2013 10:04:55 +0800
Tag:    v2.6.0-beta

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

commit 381f53e27ef49db7e68cf4542dc0464b5453125f
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Aug 2013 15:18:03 +0800
Tag:    v2.4.6

Merge branch 'MDL-30839-24' of git://github.com/phalacee/moodle into MOODLE_24_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 046514b7a2a5f89c61b3dc337464d6cc224a6427
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Aug 2013 15:17:44 +0800
Tag:    v2.6.0-beta

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

commit a101c7f011b111f4562d94f5639b85a81fd0c067
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Aug 2013 13:40:23 +0800
Tag:    v2.6.0-beta

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

commit 2af95c4b51a313ec8bfd043131060f35e2528637
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Aug 2013 13:36:02 +0800
Tag:    v2.6.0-beta

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

commit af5e39e1b64704adbb1025b837b23b96c9f7714a
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Aug 2013 11:36:40 +0800
Tag:    v2.4.6

Merge branch 'wip-MDL-36690-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_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 d99a3005639adf28c6aa8df88688a53482d591f9
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Aug 2013 11:35:27 +0800
Tag:    v2.6.0-beta

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

commit 184309fa55799d965d568c843a77ace2f278e834
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Aug 2013 10:45:07 +0800
Tag:    v2.4.6

Merge branch 'wip-MDL-32191-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_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 c3f5f4ab3710088bcacce04eb96328e5462dc93f
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Aug 2013 10:44:04 +0800
Tag:    v2.6.0-beta

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

commit c161e4687c6b5331415c4cd8f150e51f6543a986
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 18:21:17 +0800
Tag:    v2.6.0-beta

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

commit 144f35d9a25497cdc1081855a5e270c62f3accc9
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 17:51:18 +0800
Tag:    v2.6.0-beta

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

commit 43964b852a61ae10025086f06cb497512c6b5a38
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 17:10:05 +0800
Tag:    v2.6.0-beta

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

commit d5f8b7edc4b1eac1a4f356331f9fbc9baed1dae2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 17:03:47 +0800
Tag:    v2.6.0-beta

Merge branch 'w33_MDL-41094_m26_purgecleanup' of https://github.com/skodak/moodle

commit 6bbcf832c493f5a444610c21444fbd9474780682
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 16:44:09 +0800
Tag:    v2.6.0-beta

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

commit beccd9d4ffa161d7245f8086bd70d613534480c7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 16:34:18 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39770_chat' of https://github.com/andyjdavis/moodle

commit 51bfad5c91389eeac46fa920743a9b492fa62aae
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 16:07:12 +0800
Tag:    v2.6.0-beta

Merge branch 'w33_MDL-40952_m26_opcacheunit' of https://github.com/skodak/moodle

commit 7d7e0292cb2ec9942438dc0862ee1a43b8f11f9a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 15:13:02 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-40974-m26' of git://github.com/samhemelryk/moodle

commit 1dae6515848e317fe12c7853d6eb870766919129
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 14:55:07 +0800
Tag:    v2.6.0-beta

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

commit d5b076a2cadc50d787d1054b4f8eaa1f6f47394b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 14:21:38 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-37674-m26' of git://github.com/samhemelryk/moodle

commit 91a888df34209de579b68570c568f508ffdbd9e7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 12:38:08 +0800
Tag:    v2.6.0-beta

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

commit bfa4c3f3587bc7fe6d02eb4672de3ded751348a0
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 12:17:16 +0800
Tag:    v2.6.0-beta

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

commit 6f44a7336959bacba07db161ae47dac9bfc906c2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 11:42:03 +0800
Tag:    v2.6.0-beta

Merge branch 'w33_MDL-39474_m26_debugdeveloper' of https://github.com/skodak/moodle

commit 981ca84aef179a802ced4f32f6fac999a50a7f99
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 11:36:00 +0800
Tag:    v2.4.6

Merge branch 'MDL-38203_24' of git://github.com/timhunt/moodle into MOODLE_24_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 8ab325fb00cd4421956d8d8238ccacf6268088f3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 11:28:39 +0800
Tag:    v2.6.0-beta

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

commit 57cb5f5afa14a726cce35098b97cca6194bec869
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 11:07:53 +0800
Tag:    v2.6.0-beta

Merge branch 'WIP-MDL-36044-master' of git://github.com/nadavkav/moodle

commit 54a868d3beb0df5bfc3a66b8766df02261118eaf
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 10:59:31 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39236-master' of git://github.com/nadavkav/moodle

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 9d66c2bb5bc5b47a8e9527b709abf828b4357e3d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 10:47:45 +0800
Tag:    v2.6.0-beta

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

commit 4b350436cd8cbce1e192ba4e82bd6ae9e2299cb7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Aug 2013 17:51:28 +0800
Tag:    v2.4.6

Merge branch 'MDL-30839-24' of git://github.com/phalacee/moodle into MOODLE_24_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 599d7d9bdfd21bbdf999378762d428ee84bad98d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Aug 2013 17:40:37 +0800
Tag:    v2.6.0-beta

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

commit ab97bc0a1ef404fce74c795cac181394b4883d7e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Aug 2013 14:50:18 +0800
Tag:    v2.4.6

Merge branch 'MDL-40893-24' of https://github.com/mr-russ/moodle into MOODLE_24_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 c3b087ccc3a6be4083d2a76a8e46c238ba4e7842
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Aug 2013 14:50:01 +0800
Tag:    v2.6.0-beta

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

commit bee137b65ad3238b1407f58892fc85263d2230a1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Aug 2013 13:08:10 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39703_master' of https://github.com/nadavkav/moodle

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 a945d481275028b9b419abc71dfc0884b5049333
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Aug 2013 12:57:34 +0800
Tag:    v2.6.0-beta

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

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 0bfeff4c5ebc6b3ab16889477ca7dda87bbbb769
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 15 Aug 2013 16:40:29 +0800
Tag:    v2.4.6

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

commit 7031373ba89d2e12c382be5e338a2769a3bf1baf
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 15 Aug 2013 16:37:59 +0800
Tag:    v2.6.0-beta

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

commit 5fa41023dadd2463d59770bd16bc239b1e2d61dd
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Aug 2013 21:58:14 +0800
Tag:    v2.4.6

Merge branch 'MDL-39507_24' of git://github.com/timhunt/moodle into MOODLE_24_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 260ea3d9a1550a16cada70d8a752e89ffb4dfbda
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Aug 2013 15:38:37 +0800
Tag:    v2.6.0-beta

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

commit 02852c45b5797066dc9830f2991d8ed49f3f13ea
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Aug 2013 14:51:31 +0800
Tag:    v2.6.0-beta

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

commit 26e5090f9e77c5cb4f6323065f56e614b667adc8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Aug 2013 14:57:23 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-31836-m26' of git://github.com/samhemelryk/moodle

commit f9b5915bc0d3e74523458e58a2bc8344bb2db815
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Aug 2013 13:23:31 +0800
Tag:    v2.6.0-beta

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

commit 387d040b7b62166f5e89f77c9b1e647e8719a064
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Aug 2013 11:14:37 +0800
Tag:    v2.6.0-beta

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

commit 4dca09b17750f2fcd3b3a10e3f5155021f95cdc8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Aug 2013 10:56:26 +0800
Tag:    v2.6.0-beta

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

commit 41e337dd82903dd47ec3602e56f032b94d40846b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Aug 2013 09:57:52 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-19171' of https://github.com/bostelm/moodle

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

Merge branch 'MDL-39507_24' of git://github.com/timhunt/moodle into MOODLE_24_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 942a0e37d4510037c48dec339fecf90c98048f2e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Aug 2013 09:52:35 +0800
Tag:    v2.6.0-beta

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

commit aa39783515def815955bfcad0e819ffa2bfeff0e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Aug 2013 16:42:07 +0800
Tag:    v2.4.6

Merge branch 'MDL-27655_24' of git://github.com/timhunt/moodle into MOODLE_24_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 88ce8a1cb014b76041b3a9fbf17297e989114db9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Aug 2013 16:41:29 +0800
Tag:    v2.6.0-beta

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

commit f26c65003d64bffdd603cc6c33251abe593407d3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Aug 2013 16:13:29 +0800
Tag:    v2.4.6

Merge branch 'MDL-30001_24' of git://github.com/jmvedrine/moodle into MOODLE_24_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 e64f5d367aed4ef39d14be07ecd4284d9dc13381
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Aug 2013 15:54:53 +0800
Tag:    v2.6.0-beta

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

commit 7064ef523ba43c0cff1643681d675b469d6d9b99
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Aug 2013 14:27:35 +0800
Tag:    v2.6.0-beta

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

commit 2b4dbc30ee9e566a67ef809c9e063b8ce1853175
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Aug 2013 13:52:49 +0800
Tag:    v2.4.6

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

commit cb1268b109476770aa25bbe909c2be0eb40c86f0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Aug 2013 13:42:41 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41068' of https://github.com/mr-russ/moodle

commit df8cd014bedc09251e00138864f98d5847a3f457
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Aug 2013 13:29:17 +0800
Tag:    v2.6.0-beta

Merge branch 'w33_MDL-41019_m26_langcaches' of https://github.com/skodak/moodle

commit f8f6dbc37dd31fbc3f260ad8dc30e45a5f3d9a38
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Aug 2013 13:27:50 +0800
Tag:    v2.6.0-beta

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

commit f2b45ad65f2eff0bd1968e5e15953062c246d408
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Aug 2013 11:56:37 +0800
Tag:    v2.6.0-beta

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

commit 6d2fc575a615786c93869c3013d199b671d8b52f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Jul 2013 14:09:24 +0800
Tag:    v2.6.0-beta

Merge branch 'w31_MDL-39915_m26_tests' of https://github.com/skodak/moodle

commit 857e3ecb6ca771fac2ea8a444ef05a02b9ae5ec5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Jul 2013 14:06:04 +0800
Tag:    v2.6.0-beta

Merge branch 'w31_MDL-40898_m26_openhandles' of https://github.com/skodak/moodle

commit e4469ed8bfd29660002178901c8934bb6b53e0b8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Jul 2013 12:19:39 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-39814-m26' of git://github.com/samhemelryk/moodle

commit d713ba95f02cea3539b712ece77eefa7bf7bee12
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Jul 2013 09:58:21 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40548' of https://github.com/Lightwork-Marking/moodle

commit ef3a268060f08b2c3ed906f1f932eb74a5a4b9c9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 16:56:40 +0800
Tag:    v2.6.0-beta

Merge branch 'w31_MDL-40900_m26_32unzip' of https://github.com/skodak/moodle

commit f7d374bd8f9d80d3851c0c2c99ba2860de78e774
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 16:49:39 +0800
Tag:    v2.6.0-beta

Merge branch 'w31_MDL-40887_m26_minify' of https://github.com/skodak/moodle

commit 0ae497f03ab1c4ac103ee1b416d6ec44e1825bd5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 16:29:59 +0800
Tag:    v2.6.0-beta

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

commit b47b4ffd912230774cd05477f9293136adfe0195
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 15:28:17 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-40847-m26' of git://github.com/samhemelryk/moodle

commit 65f2bb09841d67367220bf78ee5478cb31447ffa
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 15:25:08 +0800
Tag:    v2.4.6

Merge branch 'MDL-40867_24' of git://github.com/timhunt/moodle into MOODLE_24_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 86005f488492832efbb339f8d3fece355c208d82
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 15:23:42 +0800
Tag:    v2.6.0-beta

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

commit 50aa2587a4418889f42f7d3df6162e43bc6a07a3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 14:14:58 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40618_restore_get_questions' of https://github.com/mr-russ/moodle

commit 48638b915deaa5cd2b1321486693b84c20e4ae06
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 13:59:55 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40323-master' of https://github.com/mackensen/moodle

commit 49ca7310a32681b75c4ff005c1103112551923b4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 13:56:57 +0800
Tag:    v2.4.6

Merge branch 'MDL-40857_24' of git://github.com/timhunt/moodle into MOODLE_24_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 8cb1af9a18d4d6b780ad2cbe75e7d9440efa19fd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 13:55:25 +0800
Tag:    v2.6.0-beta

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

commit 62ea0cb846e9bf0c2c5417c8d22c61e376dba40c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 13:48:19 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-40842-m26' of git://github.com/samhemelryk/moodle

commit 30475270930267bd233e80370f6b3e633d1c9a05
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 13:45:50 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39359_master' of https://github.com/pauln/moodle

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

Merge branch 'MDL-40775_24' of git://github.com/grabs/moodle into MOODLE_24_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 0c69118fca50b7f2851037f0e8b233c84dbe2041
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 13:28:22 +0800
Tag:    v2.6.0-beta

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

commit 397b5c063ee5b41f46a0fff26070d1a0e430c335
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 13:21:20 +0800
Tag:    v2.4.6

Merge branch 'wip-MDL-29731-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_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 2c6f05581835c48dc83f531d42e4383dbafd0b43
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 13:20:59 +0800
Tag:    v2.6.0-beta

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

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

Merge branch 'MDL-36399_24' of git://github.com/timhunt/moodle into MOODLE_24_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 90b423bda7a22fd2a3abdfdde65b1f2121f9292b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 12:40:05 +0800
Tag:    v2.6.0-beta

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

commit 245fb06b86f124ecda6c84bb53aba53a909fadcf
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 10:41:54 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40547' of https://github.com/Lightwork-Marking/moodle

commit 929088ec57819907b75ef130432e48cbf6127b95
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 10:10:09 +0800
Tag:    v2.4.6

Merge branch 'MDL-40863_24' of git://github.com/timhunt/moodle into MOODLE_24_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 47c6239483156f9b76ff93c703866e5eb7d3c98a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 10:09:45 +0800
Tag:    v2.6.0-beta

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

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

Merge branch 'MDL-20609_24' of git://github.com/timhunt/moodle into MOODLE_24_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 d96fcecc86d7f9096ef20eb602070c9600e02151
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Jul 2013 16:44:32 +0800
Tag:    v2.6.0-beta

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

commit 80a1b08d40ce702cb4963ba98ee341f633f7372c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Jul 2013 16:41:45 +0800
Tag:    v2.6.0-beta

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

commit 4523e6af1667c0bddc4b43af7af89892f5f09be8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Jul 2013 16:38:48 +0800
Tag:    v2.4.6

Merge branch 'MDL-40480_24' of git://github.com/timhunt/moodle into MOODLE_24_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 5432ccec646b48ce34e634b5d8972afb03522ef7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Jul 2013 14:26:35 +0800
Tag:    v2.6.0-beta

Merge branch 'wip_MDL-40778_v2' of https://github.com/jamiepratt/moodle

commit 066c7987b250116de874ed3678c7e42da4c072cb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Jul 2013 13:35:07 +0800
Tag:    v2.4.6

Merge branch 'MDL-40585_24' of git://github.com/mr-russ/moodle into MOODLE_24_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 33b6da7f5968faecc7c099e7eb8b64c1c4f81dd7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Jul 2013 13:33:27 +0800
Tag:    v2.6.0-beta

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

commit 151d915c54f34929184888ea6e06e60fbaa106e8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Jul 2013 13:27:32 +0800
Tag:    v2.6.0-beta

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

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

Merge branch 'MDL-40584_24' of https://github.com/mr-russ/moodle into MOODLE_24_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 3ee8607d464997d0c5d5b6bb292d842987736902
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Jul 2013 12:35:41 +0800
Tag:    v2.6.0-beta

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

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 35c117904736214c74cf82d813bccb29703f514d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Jul 2013 10:42:02 +0800
Tag:    v2.6.0-beta

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

commit 131580860b27cfa4c7b2d65a5e6c689b840a7f5e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Jul 2013 10:01:59 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-35674-form-dependencies' of https://github.com/andrewnicols/moodle

commit 9dae491a94ca86b28bd10b765f0fdc414c5d281b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Jul 2013 17:01:58 +0800
Tag:    v2.4.6

Merge branch 'w30_MDL-38867_m24_gspell' of https://github.com/skodak/moodle into MOODLE_24_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 b3a570b56e100c8f60ac8834c7e7922f243cd2d0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Jul 2013 17:00:40 +0800
Tag:    v2.6.0-beta

Merge branch 'w30_MDL-38867_m26_gspell' of https://github.com/skodak/moodle

commit 7a3f9421cb397ffd06621c3c8e8d3b3c785b2be0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Jul 2013 15:47:48 +0800
Tag:    v2.6.0-beta

Merge branch 'w30_MDL-40545_m26_localcachedir' of https://github.com/skodak/moodle

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 27e240078267fdb68a76fbf02f4752af9965a4de
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Jul 2013 15:01:26 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-38837_dev' of https://github.com/totara/openbadges

commit 82d1dc3f171d75ed2065144c5dbdb75c8d45f4cd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Jul 2013 14:36:29 +0800
Tag:    v2.6.0-beta

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

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 51425cc045664b71fbaeb21b2ed75535c98b5fee
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Jul 2013 10:45:42 +0800
Tag:    v2.6.0-beta

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

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

Merge branch 'wip-MDL-37333_M24' of git://github.com/gjb2048/moodle into MOODLE_24_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 7bdae0924f6903e763a3d2eb54802b44eec12659
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Jul 2013 10:27:11 +0800
Tag:    v2.6.0-beta

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

commit 3a1b0dd9088d53d2a8b6483b25daac12feab92ed
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Jul 2013 16:57:07 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-40430-master' of git://github.com/abgreeve/moodle

commit f6455e63ddf22ea563d3de5760664fe6c6717a9d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Jul 2013 16:52:52 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-40429-master' of git://github.com/abgreeve/moodle

commit 58b2251be36be5d4d68efe287776e4a6fe551056
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Jul 2013 16:42:18 +0800
Tag:    v2.6.0-beta

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

commit 92e9260d964fac9182854a98a3d14c9100079292
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Jul 2013 16:00:12 +0800
Tag:    v2.6.0-beta

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

commit af578aec7c4f8d9eb83edda6e3d1bdf6546f09dd
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Jul 2013 15:55:20 +0800
Tag:    v2.6.0-beta

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

commit 9e40816b3a88919942d3d158516ef8b6698c40ef
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Jul 2013 15:49:45 +0800
Tag:    v2.6.0-beta

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

commit 0574cd90612d7e97c04006a85d3ee65bb7a6d152
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Jul 2013 15:47:07 +0800
Tag:    v2.6.0-beta

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

commit d06f10cf97f42e846e5a5201b4940f8e97374df1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Jul 2013 15:43:43 +0800
Tag:    v2.6.0-beta

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

commit bb0458aa7ce51f3ff9a7c504ddc2057bf5b4725e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Jul 2013 13:38:10 +0800
Tag:    v2.6.0-beta

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

commit 6f3c780f3b98c29354bed38dbb0c1e6a814e3e08
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Jul 2013 17:09:38 +0800
Tag:    v2.6.0-beta

Merge branch 'w27_MDL-40337_m26_rolescleanup' of https://github.com/skodak/moodle

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 1e031a461691c34620a49a3494fb677eb472ba2a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Jul 2013 15:52:58 +0800
Tag:    v2.6.0-beta

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

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 fe6d32fcb3075e3c1d6d67db2ece864f4f142db3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Jul 2013 15:15:04 +0800
Tag:    v2.6.0-beta

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

commit 6e4de306369b17344536c22fa86d25e1a2e7bcc2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Jul 2013 14:27:49 +0800
Tag:    v2.6.0-beta

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

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

Merge branch 'MDL-40297_24' of git://github.com/stronk7/moodle into MOODLE_24_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 20cea2c57f54e3beb61389b32d8fec07998e25bb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Jul 2013 13:43:40 +0800
Tag:    v2.6.0-beta

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

commit b25cd1f3d55a96692fb4a59533af0248fe428004
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Jul 2013 13:34:09 +0800
Tag:    v2.6.0-beta

Merge branch 'w27_MDL-40399_m26_msarrayshift' of https://github.com/skodak/moodle

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 1edad3fd901cf3ca327a530f253c4228fdaa5542
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Jul 2013 13:33:49 +0800
Tag:    v2.4.5

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

commit e09fc9f3c1ea3bb3209213b43bd59de9b51a3ab1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Jul 2013 09:55:33 +0800
Tag:    v2.4.5

Merge branch 'w27_MDL-40266_m24_arrayshift' of https://github.com/skodak/moodle into MOODLE_24_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 ad3ebb8f5f50f3c9d1f7bcfe427fe685c274ea7d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Jul 2013 09:55:20 +0800
Tag:    v2.6.0-beta

Merge branch 'w27_MDL-40266_m26_arrayshift' of https://github.com/skodak/moodle

commit 91d445db9a3835143868db4b025e6e1e94f40a1d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 01 Jul 2013 11:55:45 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-39212-m26' of git://github.com/samhemelryk/moodle

commit 3db9731fb6bcd9d3981fc5500b9e7fff5d991f7a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 01 Jul 2013 11:22:20 +0800
Tag:    v2.4.5

Merge branch 'wip-MDL-40344-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_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 536a240891945bafcd0f3cb81781e5a30908a4aa
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 01 Jul 2013 11:21:47 +0800
Tag:    v2.6.0-beta

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

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 ba045b31a7f927bffafb394ae7ef51e74b2689ca
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 21 Jun 2013 13:23:21 +0800
Tag:    v2.6.0-beta

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

commit 0ea73a5524248178c228fb470607dae3c796e742
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 19 Jun 2013 15:47:08 +0800
Tag:    v2.6.0-beta

Merge branch 'fix_classloading8' of git://github.com/skodak/moodle

commit 6ef007def689147e3901df32b41f7e29f5cc7e44
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Jun 2013 16:47:18 +0800
Tag:    v2.6.0-beta

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

commit c0fb582c58f81122d9f3f9e63d27c7077542a85f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Jun 2013 13:10:24 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39339_master' of https://github.com/pauln/moodle

commit 0afca44627a78e283a009f1bbb2e73c6f55f5207
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Jun 2013 10:42:33 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40180_master' of https://github.com/nadavkav/moodle

commit 83b8e822f1ad7c93b254bb125617781cb0a3dc40
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Jun 2013 10:35:47 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-33105' of https://github.com/ppichet/moodle

commit e9d011250e39469ecaec2a3af60c425f7f0c2cec
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Jun 2013 17:02:11 +0800
Tag:    v2.6.0-beta

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

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 85db00e0c3b9318d7d3a5bb18a96de9130858bc2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Jun 2013 16:40:24 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39825_dev_master' of https://github.com/totara/openbadges

commit af08eb991292e55db607fc2fed7b7fb1abb41c2a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Jun 2013 15:36:15 +0800
Tag:    v2.6.0-beta

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

commit 877bb8294c7c7bbf5553f242913ac12d2122bc5a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Jun 2013 14:53:19 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-31680' of https://github.com/ppichet/moodle

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 e00916d933d7a90667eae451fd895d66ca204ec2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Jun 2013 13:37:18 +0800
Tag:    v2.6.0-beta

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

commit e3b472e82c02cc4b7718e44196d4a52e0ca4c3f3
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 13 Jun 2013 10:15:25 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-38359-master' of git://github.com/danmarsden/moodle

commit 19c1e0b80a9156d84f9b579dba22fd305d7e6cfb
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 12 Jun 2013 16:49:29 +0800
Tag:    v2.6.0-beta

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

commit 85937391e16faee03a66e6ee2b8d3ca5c2de398e
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 12 Jun 2013 16:47:38 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-38359-master' of git://github.com/danmarsden/moodle

commit 6e74e428af83364da9a02d8c4602c6a3e91c14db
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 12 Jun 2013 14:16:43 +0800
Tag:    v2.4.5

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

commit bdce4a9cca501a356d263c8f7f94be8c9fe9206c
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 12 Jun 2013 13:56:39 +0800
Tag:    v2.6.0-beta

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

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 1899145c5014913959ad207f119003d4788b6aba
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 12 Jun 2013 09:33:23 +0800
Tag:    v2.6.0-beta

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

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 e2ac6a848b5410aef725fefd0f6f541b79084513
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Jun 2013 16:00:18 +0800
Tag:    v2.6.0-beta

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

commit 75eb51818cf505a5a63132d182aebb18a06ddd27
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Jun 2013 15:41:11 +0800
Tag:    v2.6.0-beta

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

commit 2504dfd61d1b5c0b269aaee7b200a46ebe9d60cc
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Jun 2013 15:38:37 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39155' of https://github.com/jacks92/moodle

commit e7d8c56098443a62b78f6674e0c33ce24d70e94d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Jun 2013 15:36:37 +0800
Tag:    v2.4.5

Merge branch 'wip-MDL-40100-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_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 f7ec3b43a74da6a22dee47c78af7936e1042d44a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Jun 2013 15:34:48 +0800
Tag:    v2.6.0-beta

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

commit 6217bb5b8d6be8f0a4d013e06f8bd08b18b24acd
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Jun 2013 15:31:20 +0800
Tag:    v2.6.0-beta

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

commit 3873f6aa6018a51395be13dec8d8b2d307153619
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Jun 2013 14:09:12 +0800
Tag:    v2.6.0-beta

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

commit 47cddbed5c63fc97c89a5c05048cdded668debed
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Jun 2013 13:05:25 +0800
Tag:    v2.6.0-beta

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

commit 610f07c2885aae66c4c081db0d020cbfc8f6d28a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Jun 2013 12:54:59 +0800
Tag:    v2.3.8

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

commit 1ebac4eab34651686c78117f0b72b61b2d803359
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Jun 2013 12:54:48 +0800
Tag:    v2.4.5

Merge branch 'm24_MDL-40002_ETag_value_must_be_a_quoted-string' of https://github.com/scara/moodle into MOODLE_24_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 b6174c9897faffe2cf2de62206986b7dd6815ded
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Jun 2013 12:54:24 +0800
Tag:    v2.6.0-beta

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

commit fd6f924c0877a9013da4ccda26113d319b0cfe43
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Jun 2013 11:24:31 +0800
Tag:    v2.6.0-beta

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

commit bb059c31adde2e797ecd171ef8fa86341a2843a5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 16:20:56 +0800
Tag:    v2.3.8

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

commit a3ad98f25d893d6788b44a7a21e426ca8e71484a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 16:20:45 +0800
Tag:    v2.4.5

Merge branch 'MDL-39947_24' of https://github.com/aolley/moodle into MOODLE_24_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 50b5ae4a8d8cbb230422fcbb3c669157d223a895
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 16:19:56 +0800
Tag:    v2.6.0-beta

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

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 c6898e629b4fb267eaaf609c59c6f891f22d5268
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 16:06:22 +0800
Tag:    v2.6.0-beta

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

commit 61603bb034d75701d9f49149f656648e6d485cfc
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 15:43:25 +0800
Tag:    v2.3.8

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

commit 9ab6e7d8518019d62759af2f248d06c4e44e4764
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 15:43:15 +0800
Tag:    v2.4.5

Merge branch 'm24_MDL-39832_Fix_Chrome_Issues_ETag_XSendfile' of https://github.com/scara/moodle into MOODLE_24_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 0a006517e5620f32e8a22fddcb43103992e5b134
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 15:42:45 +0800
Tag:    v2.6.0-beta

Merge branch 'm26_MDL-39832_Fix_Chrome_Issues_ETag_XSendfile' of https://github.com/scara/moodle

commit f4c824c0096e213dac9adb206013dfb0bba49b28
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 15:28:17 +0800
Tag:    v2.6.0-beta

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

commit 885c3f5824d100fa488c875d7a54c6f01ae78a74
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 15:00:39 +0800
Tag:    v2.3.8

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

commit 24e89189a7f9e818a3fbecec5d54c840f8f0d32f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 15:00:32 +0800
Tag:    v2.4.5

Merge branch 'MDL-40018_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_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 de235efba4804822ca0b4c9bd316c404c965e156
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 15:00:08 +0800
Tag:    v2.6.0-beta

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

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 bb179ab9b4d9972c67268048aae1cf7b72bbd935
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 14:57:48 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40013_master' of git://github.com/oasychev/moodle

commit 70913901645389a77a059bee54aee718f8f85e2b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 14:41:20 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40080-unused-hub-strings' of git://github.com/mudrd8mz/moodle

commit 8a78b9116a8b509f34858c9ab1fd1a27114dd270
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 14:25:03 +0800
Tag:    v2.6.0-beta

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

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 28fa1533f70ee3824695588bc4ab9ae37d03b40c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 13:12:11 +0800
Tag:    v2.6.0-beta

Merge branch 'w24_MDL-39096_m26_obfuscate' of git://github.com/skodak/moodle

commit 1735fbc1efc980577f7cbca80c9f6e57ef763297
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 12:51:51 +0800
Tag:    v2.3.8

Merge branch 'MDL-39667-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit e4737333eb124961b18c65c66414fb087a88aa04
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 12:51:44 +0800
Tag:    v2.4.5

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

commit e9ec51287594e179a1ad6b92dc669c585794f282
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 12:17:14 +0800
Tag:    v2.4.5

Merge branch 'w24_MDL-28394_m24_enrolrestore' of git://github.com/skodak/moodle into MOODLE_24_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 664a1e2793585f02be2f02fad429f9dfab01a8a3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 12:16:37 +0800
Tag:    v2.6.0-beta

Merge branch 'w24_MDL-28394_m26_enrolrestore' of git://github.com/skodak/moodle

commit 60a6533433999d0e07b5573af021b9cf28018ff3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 12:10:15 +0800
Tag:    v2.4.5

Merge branch 'm24_MDL-37968' of git://github.com/danmarsden/moodle into MOODLE_24_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 bed1bc3ddcb8aac2c0d343b326a5bc87550f9230
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 12:09:47 +0800
Tag:    v2.6.0-beta

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

commit 3178aacd9efdb692c1991af71736ad0e78a21d4d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 11:59:03 +0800
Tag:    v2.6.0-beta

Merge branch 'w24_MDL-37974_m26_manexpire' of git://github.com/skodak/moodle

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 07bac478b6239246c534a48c73240cf66ad1d576
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 10:54:22 +0800
Tag:    v2.6.0-beta

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

commit 4abc48ac46fe6924e8231e4fda52dac192c38d57
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 06 Jun 2013 11:55:56 +0800
Tag:    v2.3.8

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit 60fcc78c1f229b7cd0b58f63e924fb93ea84bc07
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 06 Jun 2013 11:55:29 +0800
Tag:    v2.4.5

Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_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 348cebac1c9b9192724b34dde0ad87fd3f477398
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 06 Jun 2013 11:54:47 +0800
Tag:    v2.6.0-beta

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

commit 330ae1764f9cc49b4ed7e81e67b8fc0ad72098a8
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Jun 2013 13:11:58 +0800
Tag:    v2.3.8

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

commit 64a21db7668caf527d2a6ce6939d120cd5edea7f
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Jun 2013 13:10:46 +0800
Tag:    v2.4.5

Merge branch 'wip-MDL-21097-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_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 1caff55c2ca9815d0c9c34033c598cf88af14aa0
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Jun 2013 13:10:12 +0800
Tag:    v2.6.0-beta

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

commit c05660fc35c879dbc78ebd55b6b607095f331c59
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Jun 2013 10:11:42 +0800
Tag:    v2.6.0-beta

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

commit 7165b1586f8a6a6fa9aab3ecafdb99639944fa87
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 15:54:12 +0800
Tag:    v2.4.5

Merge branch 'MDL-39945_24' of git://github.com/timhunt/moodle into MOODLE_24_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 dd03ed1051129a11f03594ebd5608e38f2ad7d9b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 15:53:56 +0800
Tag:    v2.6.0-beta

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

commit 09b91f0fff6f922e8f907ba28b9bc110a5364a03
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 14:45:09 +0800
Tag:    v2.4.5

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

commit 20fe8676ea3709c2cb24e214ddeae9535f9920d0
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 14:44:35 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39835_M26' of github.com:lazydaisy/moodle

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 93ab0810256cf90b05e237391088470e96092b2d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 14:37:55 +0800
Tag:    v2.6.0-beta

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

commit e404e040d345efdab85b198e24ab3ea72e8a7612
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 14:14:18 +0800
Tag:    v2.6.0-beta

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

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 42d00d363896c53e2b360124b2800d1d3790fec1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 13:31:34 +0800
Tag:    v2.6.0-beta

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

commit 7b21fa17121180369322321cda0ec2a28300fdaa
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 13:25:38 +0800
Tag:    v2.3.8

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

commit d000c1a38017a2917d4cfa94fc2d8d346b84f26a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 13:20:56 +0800
Tag:    v2.4.5

Merge branch 'MDL-39536-24' of git://github.com/FMCorz/moodle into MOODLE_24_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 7f639dd35281eba1b27355021e01060d73733491
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 13:18:49 +0800
Tag:    v2.6.0-beta

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

commit 984dc35457e3a0fd4bc72791e6c54ec9530aaef2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 12:27:30 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39939-scorm-basic-report-name' of git://github.com/mudrd8mz/moodle

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 4dfadbc99b5e4e53d2e2ec56e55ae902a49a753f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 11:29:38 +0800
Tag:    v2.6.0-beta

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

commit 6bc6ddd29d7acbecd9972030719477fc1bc5d01f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 11:26:53 +0800
Tag:    v2.3.8

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

commit 4802b1ed8e061124b9e02dc94e851562d7ef2546
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 11:26:45 +0800
Tag:    v2.4.5

Merge branch 'MDL-39317-24' of git://github.com/damyon/moodle into MOODLE_24_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 ea746c01668a1e832fb6d2612a0627bdee1f0310
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 11:26:28 +0800
Tag:    v2.6.0-beta

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

commit 0dc499ec7fa2c725900b81df69daaeed85e75f57
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 11:03:55 +0800
Tag:    v2.4.5

Merge branch 'MDL-39743-24' of git://github.com/damyon/moodle into MOODLE_24_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 0d9121a1c44bda6d0cce226f8f54f461c7730367
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 11:03:39 +0800
Tag:    v2.6.0-beta

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

commit 5f7c57ef8523357b2b163eabe2b94d6ace5713f8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 10:43:28 +0800
Tag:    v2.3.8

Merge branch 'wip_23_mdl-34085' of https://github.com/iarenaza/moodle into MOODLE_23_STABLE

commit 4c8664099edcc8ef0ab5d416b673632aafcd06f7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 10:43:18 +0800
Tag:    v2.4.5

Merge branch 'wip_24_mdl-34085' of https://github.com/iarenaza/moodle into MOODLE_24_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 820b66be5887dc7c7650b8589a585ad64de62c6e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 10:42:45 +0800
Tag:    v2.6.0-beta

Merge branch 'wip_master_mdl-34085' of https://github.com/iarenaza/moodle

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 550e8d5bc76dae67a08ed446fea730a65855ba74
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 27 May 2013 14:36:46 +0800
Tag:    v2.6.0-beta

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

commit 92e24958e54bb138e5c00968e63a39750f7ecdff
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 27 May 2013 14:17:00 +0800
Tag:    v2.6.0-beta

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

commit be5a3e6117f9733e7c6240b90c293e22c342c438
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 27 May 2013 14:14:03 +0800
Tag:    v2.3.8

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

commit b3ae0c52bf13337fb7bce94fa6262c880d75f373
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 27 May 2013 14:13:52 +0800
Tag:    v2.4.5

Merge branch 'MDL-38239-moodle24' of git://github.com/StudiUM/moodle into MOODLE_24_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 87787191e44d6f8aaa8e4637b13c87bea38bdfa8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 27 May 2013 14:04:04 +0800
Tag:    v2.6.0-beta

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

commit 4aa5c142a176ca2a4e05830eeb76149986bb6078
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 27 May 2013 13:43:55 +0800
Tag:    v2.3.8

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

commit a67482cb0e2e23b48508f88a445b0e2d015687ee
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 27 May 2013 13:43:45 +0800
Tag:    v2.4.5

Merge branch 'w22_MDL-39688_m24_etag' of git://github.com/skodak/moodle into MOODLE_24_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 5584adfe70a7e5d3314f715c1b13b3fca586228b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 27 May 2013 13:43:13 +0800
Tag:    v2.6.0-beta

Merge branch 'w22_MDL-39688_m26_etag' of git://github.com/skodak/moodle

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 cce01b49c1180c7dcfc5822e66d27ba943c8c0b3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 27 May 2013 13:04:45 +0800
Tag:    v2.6.0-beta

Merge branch 'w22_MDL-38408_m26_paypalcost' of git://github.com/skodak/moodle

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 047a79baed7b6a235895c384e09389c21bae6f6c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 27 May 2013 10:18:21 +0800
Tag:    v2.6.0-beta

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

commit 1efdabfb91266d0367ba1751786f9225bc4eafa0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 27 May 2013 10:03:47 +0800
Tag:    v2.2.11

Merge branch 'w22_MDL-25031_m22_blockupgrade' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit ec969f891f0c8fa55c07aa5cdfbd20d37510e696
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 May 2013 12:30:11 +0800
Tag:    v2.6.0-beta

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

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 a22b8a83e75cba4fe93392d162922a7f878d22b5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 May 2013 10:58:37 +0800
Tag:    v2.6.0-beta

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

commit 2f6568796af1efa42ab4c769ff7632190c955f96
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 May 2013 10:43:34 +0800
Tag:    v2.6.0-beta

Merge branch 'wip_master_mdl-39323_fix_start_tls_undefined_notice' of https://github.com/iarenaza/moodle

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

Merge branch 'w18_MDL-39374_m24_folderlog' of git://github.com/skodak/moodle into MOODLE_24_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 ef78682e4478cdd04f1821eae7031f65f3f16c55
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 May 2013 17:58:09 +0800
Tag:    v2.6.0-beta

Merge branch 'w18_MDL-39374_m26_folderlog' of git://github.com/skodak/moodle

commit 2b6e9bd10aa4655ad65366a9cf4d4c30109f3cf7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 May 2013 16:39:12 +0800
Tag:    v2.3.8

Merge branch 'MDL-35859_idnumber_23' of https://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit 8fedda2fc4f00efc8df5d91576a1b49b583f18e2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 May 2013 16:39:04 +0800
Tag:    v2.4.5

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

commit 9e95723c609712f3c382fc71154da92e02046085
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 May 2013 16:08:51 +0800
Tag:    v2.6.0-beta

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

commit 2d0669e775c0315404b06a132b8ce669211b77f4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 May 2013 15:49:09 +0800
Tag:    v2.3.8

Merge branch 'MDL-27748_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 133defa35344ff3fea014114d7dee87343a4bfbb
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 May 2013 15:47:34 +0800
Tag:    v2.4.5

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

commit d6aec96dd5a95eca591ec333759e384b34cf425f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 May 2013 15:46:49 +0800
Tag:    v2.6.0-beta

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

commit aaea60dea03432f60e6095cad507c177f18598ae
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 May 2013 15:29:21 +0800
Tag:    v2.3.8

Merge branch 'MDL-39728_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit de78a8b251aea5d2a55e24c321019fa6a79f7255
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 May 2013 15:29:13 +0800
Tag:    v2.4.5

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

commit 7ae324cb350f1d28e330c71fd17664a9c5f0da59
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 May 2013 15:28:31 +0800
Tag:    v2.6.0-beta

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

commit b04bfcfc543d904003c4369be3f4bd96823513d0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 May 2013 12:42:17 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-36020-master' of git://github.com/troylee/moodle

commit 2f75633c6fb9533613ab6e56abe1612bacc3cabe
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 May 2013 12:01:01 +0800
Tag:    v2.6.0-beta

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

commit dfd948b0f0017beaae557f29c4d63c66020eb02f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 May 2013 11:48:33 +0800
Tag:    v2.4.5

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

commit 02f92b2d8606c0f6903edb8f2dbe01ac011ba490
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 May 2013 11:47:50 +0800
Tag:    v2.6.0-beta

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

commit aa108f612566ab24978b5fb09d9f6d9fcf5e8ed5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 May 2013 10:26:14 +0800
Tag:    v2.3.8

Merge branch 'MDL-38369-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 6336c04705ebf3e84feaf1f67d88d08731d74cb5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 May 2013 10:25:52 +0800
Tag:    v2.4.5

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

commit 22c8aeb018fd9a70ee52dbc2d5a748c238e38c58
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 May 2013 10:25:08 +0800
Tag:    v2.6.0-beta

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

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 0edd01e9434d4438b18581401235db6a01e089d9
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 May 2013 22:28:42 +0800
Tag:    v2.3.7

Merge branch 'MDL-36223-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

commit 54061d7cbf424bb3821c61a8f3b56757c8fe1c92
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 May 2013 22:28:33 +0800
Tag:    v2.4.4

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

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 217eeccb26e8ff4bd9cfba25a150c9bf5d22364e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 May 2013 22:13:18 +0800
Tag:    v2.4.4

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

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 14b536dd6fd97b78d6c5dedcaeadf492aa5dde43
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 May 2013 18:54:32 +0800
Tag:    v2.3.7

Merge branch 'MDL-38500-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit b15eea60090264ac12b7869f69086c8e88481e43
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 May 2013 18:54:24 +0800
Tag:    v2.4.4

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

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 3565867b4f6f48f600d6136b5a492768f7460941
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 May 2013 21:48:23 +0800
Tag:    v2.3.7

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

commit 8d0835e64b2c721ca3dfe36b358f1511ad0ce6d7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 May 2013 21:48:15 +0800
Tag:    v2.4.4

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

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 fc7f2b1a2fed0bcdfb80d6a636ce18b5b86094cc
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 May 2013 21:33:02 +0800
Tag:    v2.4.4

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

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 100da2dcfb2c6e1bbeb7eb6ed1e59a79b7b43087
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 May 2013 20:12:23 +0800
Tag:    v2.3.7

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

commit b73f62ef9bf5ad640319cb52e7920e4c060ad9f2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 May 2013 20:11:58 +0800
Tag:    v2.4.4

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

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 6d28ff14f09d927bc74c51852f0f9b611661adf7
Author: Dan Poltawski <dan@moodle.com>
Date:   Sun, 05 May 2013 18:30:40 +0800
Tag:    v2.3.7

Merge branch 'brokencalc_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit 56463941a8357d5b87f00b2ee2bc2b4397ecb856
Author: Dan Poltawski <dan@moodle.com>
Date:   Sun, 05 May 2013 18:30:31 +0800
Tag:    v2.4.4

Merge branch 'brokencalc_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE

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 76645b7e6cf1c60114b10c0a0bf744259040a478
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 02 May 2013 21:32:32 +0800
Tag:    v2.3.7

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit bffe667ae05bb6e4b14ec96f4e7e35220e7af2f7
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 02 May 2013 21:32:19 +0800
Tag:    v2.4.4

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

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 cfbf324052bf9c18fd37e1f59fe1b64536a3d3b3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Apr 2013 21:08:32 +0800
Tag:    v2.3.7

Merge branch 'MDL-35385_chat_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit fb0698f3444460f75043b246d3de5cbf198dfc44
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Apr 2013 21:08:06 +0800
Tag:    v2.4.4

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

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 e46515bd834d2f94fb1adf8f092b9ad5ac0e634d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Apr 2013 00:01:12 +0800
Tag:    v2.3.7

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

commit c0f02f7c89616f2e87790be78352406a4042bbc7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Apr 2013 00:01:03 +0800
Tag:    v2.4.4

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

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 d3c575bd6f2ce56aea4b0447f50cd707b14722e0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Apr 2013 17:27:52 +0800
Tag:    v2.3.7

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

commit 3fb4ce7d58d9a9ea8a6316e62061bbb6bd86cf76
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Apr 2013 17:27:41 +0800
Tag:    v2.4.4

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

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 092f45148a836c9ab65d46be31b90618255935d6
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 25 Apr 2013 19:59:31 +0800
Tag:    v2.3.7

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

commit 0b8cda3b9e7c5238a17b1f5ba5660b460c096c92
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 25 Apr 2013 19:54:17 +0800
Tag:    v2.4.4

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

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 161f4e0d79802535e976f97eadccf58d6c3311b5
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 25 Apr 2013 17:32:28 +0800
Tag:    v2.3.7

Merge branch 'MDL-29258_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE

commit 3aba4326d4ca85512ddd90e96b7e9ebf794e14f9
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 25 Apr 2013 17:29:55 +0800
Tag:    v2.4.4

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

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 f8028c2f30c0ad464db1c3176091c21db4478c96
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 24 Apr 2013 21:36:26 +0800
Tag:    v2.3.7

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

commit ce024436be12a7b5fc70f492ca098a86f9e2c8e1
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 24 Apr 2013 21:35:09 +0800
Tag:    v2.4.4

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

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 fdeb0d80ed04816cf8eaa9c81206e0f24b8ec295
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 24 Apr 2013 16:08:49 +0800
Tag:    v2.4.4

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

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 2a4eeac06751e709f3c0fd07c4951291e27ff30e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Apr 2013 20:00:39 +0800
Tag:    v2.4.4

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

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 5559857f9ed08598fb6985900d39ea081e1369a6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Apr 2013 19:50:51 +0800
Tag:    v2.4.4

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

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 3fd370acde1c757ae8bb83e36d16850c76879ca8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Apr 2013 19:40:44 +0800
Tag:    v2.4.4

Merge branch 'w16_MDL-39141_m24_toolbar' of git://github.com/skodak/moodle into MOODLE_24_STABLE

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 6f69ef749e05f0164b8e4325c3bc064f210f9031
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 19 Apr 2013 22:20:36 +0800
Tag:    v2.4.4

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

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 18646a683b1751ae64f10efab4fd664898c2bda0
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 19 Apr 2013 22:12:00 +0800
Tag:    v2.3.7

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

commit d9a277684fde0b2ab886cebc4a97e805790f25a9
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 19 Apr 2013 22:11:48 +0800
Tag:    v2.4.4

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

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 0c60dae52210a74daa29a063f6ff181dab2a864c
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 19 Apr 2013 20:47:44 +0800
Tag:    v2.4.4

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

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 0d80c1cc7a10ff8b920925d6457492b7890cc0ef
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 18 Apr 2013 19:44:04 +0800
Tag:    v2.4.4

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

commit cd8dbd11a2e72e4560fe301cb8882759f8722474
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 18 Apr 2013 19:43:54 +0800
Tag:    v2.3.7

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit 64402c1fe7c2a72b3911fa2299b53ea8245ed3c0
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 18 Apr 2013 19:43:12 +0800
Tag:    v2.2.10

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

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 8803e9c7e19fd0427faed8c138d960e81801ed9f
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 18 Apr 2013 15:44:10 +0800
Tag:    v2.4.4

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

commit a5ce56011ae4394ff535b68a5f44e094317225df
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 18 Apr 2013 15:36:32 +0800
Tag:    v2.3.7

Merge branch 'MDL-39203-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 32f2cceeccc329eb86835577ca88825eebb91c07
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 17 Apr 2013 21:38:18 +0800
Tag:    v2.3.7

Merge branch 'MDL-38824-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE

commit f8e976e56a0b25deb8249352152d65e2a02100bb
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 17 Apr 2013 21:38:06 +0800
Tag:    v2.4.4

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

commit ea4841fbef5765e70df06e93141b30c099ac860a
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 17 Apr 2013 20:02:47 +0800
Tag:    v2.4.4

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

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 387dc90072dbca39690e0bddfd323be7d85c2dfe
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Apr 2013 19:45:14 +0800
Tag:    v2.3.7

Merge branch 'MDL-39080_M23' of git://github.com/kordan/moodle into MOODLE_23_STABLE

commit 464ab7894b333558f36be20a967669c7e125b8a8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Apr 2013 19:45:01 +0800
Tag:    v2.4.4

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

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 770e8c02dbf4dcef8d862a819a5bf4c6c5605d81
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Apr 2013 23:25:30 +0800
Tag:    v2.3.7

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

commit dd79ab10b397a7d7053a27acdc6aa79e31e93f4a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Apr 2013 23:25:15 +0800
Tag:    v2.4.4

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

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 fd33a80fa1a8e57e8161c9c2a25c9019388155c1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Apr 2013 15:30:32 +0800
Tag:    v2.3.7

Merge branch 'MDL-39000-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE

commit ef9c4b6ef51fb86fb7ec2020f64b8a8f7abf0615
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Apr 2013 15:30:16 +0800
Tag:    v2.4.4

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

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 7af74e7f19108d8938f2ef88a529cefa2f69b502
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Apr 2013 14:59:10 +0800
Tag:    v2.4.4

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

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 595ef991eeb6cd691618c6da393b8230eb9151ea
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 12 Apr 2013 10:26:57 +0800
Tag:    v2.3.7

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

commit 5c58c88545262d37f36d609bb16bf9f14065fdeb
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 12 Apr 2013 10:26:45 +0800
Tag:    v2.4.4

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

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 b3e792b946ef7f3d5d02a45e504703f6f1b060d3
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 10 Apr 2013 14:11:03 +0800
Tag:    v2.3.7

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

commit 4e7aef7651b7a1879fcc135cf4a9e44c44520459
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 10 Apr 2013 14:10:51 +0800
Tag:    v2.4.4

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

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 5bad12404571ccc1f8e21109ba97bd52769a055a
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 10 Apr 2013 12:23:53 +0800
Tag:    v2.4.4

Merge branch 'MOODLE_24_MDL35144' of git://github.com/thepurpleblob/gumoodle into MOODLE_24_STABLE

commit c01f9e8bc103cc047c9f3f7e9380786750bdcb5a
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 10 Apr 2013 12:16:58 +0800
Tag:    v2.3.7

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

commit eda9f7bd436abb4df21cebeb702d5b3c1a26d1bf
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 10 Apr 2013 12:16:40 +0800
Tag:    v2.4.4

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

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 7d042f6734bccc66c98c13948cf3ff824a50c824
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 10 Apr 2013 12:13:51 +0800
Tag:    v2.3.7

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

commit 3a44f70e628fed7357a0e75ea667cfdf051eef60
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 10 Apr 2013 12:13:28 +0800
Tag:    v2.4.4

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

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 2967681e646315a61965d51c503bb6befaa94bf6
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 10 Apr 2013 10:36:00 +0800
Tag:    v2.3.7

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

commit a1ec11837883179a8d7bc6b5143692a123aa0a08
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 10 Apr 2013 10:35:52 +0800
Tag:    v2.4.4

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

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 650e0141fe3e5020d20009a42616de35c014f650
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Apr 2013 15:40:38 +0800
Tag:    v2.3.7

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

commit 892c4e1bc6d1db7bd414d23c6334924b95345f62
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Apr 2013 15:40:19 +0800
Tag:    v2.4.4

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

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 112bb36c24682c550e671f5f1652b1fba1d1d0dc
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Apr 2013 10:38:22 +0800
Tag:    v2.3.7

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

commit dec2c2086fffd4edcdbca0dbb5991be579043a06
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Apr 2013 10:38:09 +0800
Tag:    v2.4.4

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

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 e37db6dc174c2d387b796e527352ccc29b848ff4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Apr 2013 09:48:27 +0800
Tag:    v2.3.7

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

commit 927416c2f3e116a379f545624913fa6c69147bbf
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Apr 2013 09:48:05 +0800
Tag:    v2.4.4

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

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 c2217f57d0000e2d131b799f15397a94bc19dd3e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Apr 2013 14:07:10 +0800
Tag:    v2.3.7

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

commit 99a66861b748450f42bb12f3aedc9d109ee547b8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Apr 2013 14:07:04 +0800
Tag:    v2.4.4

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

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 3a509e1a6a69c4fc6973120f48dd5f3029469fb4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Apr 2013 10:23:21 +0800
Tag:    v2.4.4

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

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 8318d25d49e6a44046b6b7712bb0c60bd7b30114
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 05 Apr 2013 17:53:03 +0800
Tag:    v2.3.7

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit 76593ae5e6581782d98e0705dff337708ab5f4e2
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 05 Apr 2013 17:52:35 +0800
Tag:    v2.4.4

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

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 f24fb2fec49dabe2b8919a59f4f47daae00c9ae1
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 03 Apr 2013 16:51:39 +0800
Tag:    v2.3.7

Merge branch 'MDL-38657_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit b7f0af199daaaf814a6ae837f7ac0036fb9abb4e
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 03 Apr 2013 16:51:13 +0800
Tag:    v2.4.4

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

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 e53be83e1051c88673db8f1bf8d867321ed351c9
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Apr 2013 14:27:39 +0800
Tag:    v2.3.7

Merge branch 'MDL-35603_23' of git://github.com/rlorenzo/moodle into MOODLE_23_STABLE

commit ecfa79b801a5371a81f71c0ac11c58603fb1c3e5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Apr 2013 14:26:47 +0800
Tag:    v2.4.4

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

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 8132e0f899222a3d70d8130b6a94961740d890c2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Apr 2013 10:04:56 +0800
Tag:    v2.3.7

Merge branch 'MDL-38702_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit 536780c5dec45a86f94953240879964f696f7929
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Apr 2013 10:04:47 +0800
Tag:    v2.4.4

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

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 7d37889b31939123f618fa2e51fb85c638d957e1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Feb 2013 11:00:19 +0800
Tag:    v2.3.5

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

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

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

commit 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 637611a7b3ef49497402f2074cedc0a0934784cc
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Feb 2013 10:21:05 +0800
Tag:    v2.3.5

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

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

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

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

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

commit 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 aa38d80df4b31c7efdcb890e2f617b497ddaf9ec
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Feb 2013 14:07:33 +0800
Tag:    v2.3.5

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

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

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

commit 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 5affcb30bc311f886a53652e01a2884ddc320d3d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Feb 2013 13:44:55 +0800
Tag:    v2.3.5

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

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

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

commit 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 e9328f579e644bf728585129bcd087648921f261
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Feb 2013 13:42:07 +0800
Tag:    v2.3.5

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

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

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

commit 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 cb7da8e091a4d6741114ffa0b11586d2fe1d95ad
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Feb 2013 12:26:03 +0800
Tag:    v2.3.5

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

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

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

commit 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 eb6dcde62d54de8e5633334319f2d8d2eb9734d7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Feb 2013 11:23:56 +0800
Tag:    v2.3.5

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

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

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

commit 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 c3724a7002afef08eba97d4564a300f7b4ada104
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Feb 2013 10:56:47 +0800
Tag:    v2.3.5

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

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

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

commit 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 15cc42fb9cb584e66ff1cea05bec9f52507450cf
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Feb 2013 16:00:07 +0800
Tag:    v2.3.5

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

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

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

commit 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 0ca9918428eccc2a76df5e3528d4e5e1d74232c2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Feb 2013 14:27:51 +0800
Tag:    v2.3.5

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

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

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

commit 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 9f4cd940b11ad7b1076d48d053026d2bbc4d4607
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Feb 2013 14:18:46 +0800
Tag:    v2.3.5

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

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

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

commit 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 45c8baafd0041bc39ba917221e3265f076a36cba
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Feb 2013 12:24:23 +0800
Tag:    v2.3.5

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

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

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

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

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

commit 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 d62384280774fb9a121fad98be3fd8cfb1e6909b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Feb 2013 11:07:48 +0800
Tag:    v2.3.5

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

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

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

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

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

commit 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 fff248b163b3f9f9b6867188bd418e6d537a52b2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Feb 2013 15:50:10 +0800
Tag:    v2.3.5

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

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

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

commit 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 35f7e66ed715b9ef14157649abd69abe9bc6c735
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Feb 2013 14:42:43 +0800
Tag:    v2.3.5

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

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

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

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

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

commit 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 0225b635c4c47a8f6062444b5c90db59c5de42a2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Feb 2013 13:40:04 +0800
Tag:    v2.3.5

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

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

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

commit 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 ac45271157925ec441cc25ec0da0aba6def616a4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Feb 2013 13:36:15 +0800
Tag:    v2.3.5

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

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

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

commit a8bf41cec6c6a1f6862ee0ba34ceaff48aba6405
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Feb 2013 12:27:02 +0800
Tag:    v2.3.5

Merge branch 'MDL-37964_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE

commit 35f667d8501fd497752dbbffe751b8b0a25a1605
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Feb 2013 10:34:23 +0800
Tag:    v2.3.5

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

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

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

commit 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 f81a08b4910d458aef8379af6b047858d5becd82
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Feb 2013 09:46:28 +0800
Tag:    v2.3.5

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

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

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

commit 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 731ff94a878298f615175ad203c4fd5d51e46788
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Feb 2013 14:33:36 +0800
Tag:    v2.3.5

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

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

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

commit 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 ffad867dd01dfe6ea7bfa900473a11419885758a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Feb 2013 13:58:56 +0800
Tag:    v2.3.5

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

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

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

commit 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 e04ddf75cb347a383ea9cc20691e203c1a17c56e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Feb 2013 12:43:24 +0800
Tag:    v2.3.5

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

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

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

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

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

commit 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 d80a777866300099e1edfcb4f40ce0d935076b07
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Feb 2013 09:58:41 +0800
Tag:    v2.3.5

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

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

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

commit 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 7c67ab3c14c8844ccb90c2f94faeef13bf05734a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Feb 2013 16:14:22 +0800
Tag:    v2.3.5

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

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

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

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

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

commit 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 b4f52cf9af0486567797d1b71da83fc4ff1fcffb
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Feb 2013 14:31:01 +0800
Tag:    v2.3.5

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

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

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

commit 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 1a5f2cf0580ab993186c3560264178a28acddadf
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Feb 2013 13:49:42 +0800
Tag:    v2.3.5

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

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

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

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

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

commit 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 6f4c3571b8f9f8b6995ce00b793ae380950b2f1e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Feb 2013 11:57:25 +0800
Tag:    v2.3.5

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

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

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

commit 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 567fdbfa334881111ecc027e4486a667050cc946
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Feb 2013 10:17:56 +0800
Tag:    v2.3.5

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

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

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

commit 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 1a305ff1b98e45fbb94a73a62fd75f2b51f43f60
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Feb 2013 10:14:07 +0800
Tag:    v2.3.5

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

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

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

commit 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 e17b0a6a8cb754ae022f48b78e61a34ba07fb3e4
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 31 Jan 2013 10:15:00 +0800
Tag:    v2.3.5

Merge branch 'm23_MDL-34231' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

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

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

commit 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 87db6e272e40ced0bfa777211b8df3caf73ef134
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Jan 2013 11:54:51 +0800
Tag:    v2.3.5

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

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

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

commit 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 11c1663d71032a6c6c0afef8b211b2580a1e074d
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 Jan 2013 15:58:26 +0800
Tag:    v2.3.5

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

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

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

commit 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 4b081e7037b25ae8a36634c12e243a1cf9cd0b2a
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 Jan 2013 12:36:26 +0800
Tag:    v2.3.5

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

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

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

commit 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 38f688108dc38479cb3147340c59d4044a061f7a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 14:00:42 +0800
Tag:    v2.3.5

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

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

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

commit 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 166cb23ea4714df0716432b481c372a66d8ff986
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 12:52:08 +0800
Tag:    v2.3.5

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

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

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

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

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

commit 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 6042f30d5f6f4a4e97e5a3928b5d17f670dd5048
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 12:46:23 +0800
Tag:    v2.3.5

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

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

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

commit 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 9e4c326cafcccae9c673a7e9709f509e22a65b8d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 12:44:07 +0800
Tag:    v2.3.5

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

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

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

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

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

commit 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 49042e1c8c55fde8284a22352c26817a07a39db7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 11:53:57 +0800
Tag:    v2.3.5

Merge branch 'MDL-37430-23' of github.com:damyon/moodle into MOODLE_23_STABLE

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

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

commit 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 0302aca4ecf310a0fec5ff4794b636726014523e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 11:48:26 +0800
Tag:    v2.3.5

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

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

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

commit 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 211fa38ca5ae9c18525f5c1a9472bb685da14e09
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 11:40:28 +0800
Tag:    v2.3.5

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

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

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

commit 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 e21f9dd98239644c0ab95a7d8bed1f7efd060d5a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 11:14:42 +0800
Tag:    v2.3.5

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

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

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

commit 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 a932d0c4cc42402c5b974d9de9a1e8e685f236e2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jan 2013 09:06:44 +0800
Tag:    v2.3.5

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

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

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

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

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

commit 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 812ea3aae2bde71868c324ea9ac1ffb75a43e985
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Jan 2013 10:15:31 +0800
Tag:    v2.3.5

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

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

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

commit 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 b0da482ae0841217ffcedb704b285a0b6f2f7729
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Jan 2013 10:09:07 +0800
Tag:    v2.3.5

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

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

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

commit 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 176bb7570bbf5235a81a04303e790775686c3a29
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Jan 2013 10:04:04 +0800
Tag:    v2.3.5

Merge branch 'MDL-37527-23' of github.com:damyon/moodle into MOODLE_23_STABLE

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

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

commit 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 0d674390c35a7d52e538e01d80ef285f1103e2ce
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Jan 2013 09:01:26 +0800
Tag:    v2.3.5

Merge branch 'm23_MDL-36421' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

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

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

commit 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 fa0218be0e98b9dde5c0357987a6f7a3c3fdc7fe
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Jan 2013 14:31:25 +0800
Tag:    v2.3.5

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

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

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

commit 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 92a3802c39a1fdf8f2de4a467475146ca71dfe93
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 17 Jan 2013 13:48:42 +0800
Tag:    v2.3.5

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

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

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

commit 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 5919718019827531d913e665b40f3fa4c5a26892
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 17 Jan 2013 10:23:15 +0800
Tag:    v2.3.5

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

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

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

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

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

commit 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 50dcac01eb119fe7a70de128d6db37eebcc8d289
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Jan 2013 09:57:01 +0800
Tag:    v2.3.5

Merge branch 'MDL-36412-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE

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 cd0523a78eefea28cb73b635211bc2a431dddc78
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Jan 2013 09:40:07 +0800
Tag:    v2.3.5

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

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

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

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

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

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

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

commit 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 ded1043407ed22bcb3ebd844f0ca14dde03b5ed6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 13:34:02 +0800
Tag:    v2.3.5

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

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

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

commit 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 b175cf2c72966e9cf4296ca77d68d9b33bdafc15
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 12:59:54 +0800
Tag:    v2.3.5

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

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

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

commit 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 25ad1dea0ee2176b12d130c5688c1f20b812ddad
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 12:42:09 +0800
Tag:    v2.3.5

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

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

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

commit 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 58a52d66b0bf6c5369a5e757d9b3519b16265511
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 11:48:30 +0800
Tag:    v2.3.5

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

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

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

commit 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 9376a1e59bfc4e8d62646d7280083a4d04af793c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 10:58:47 +0800
Tag:    v2.3.5

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

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

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

commit 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 a89c9384fa8d964a1152818ec0a6e9cfecb909ff
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Jan 2013 10:43:44 +0800
Tag:    v2.3.5

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

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

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

commit 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 a07dccc1c5cf35d4ce3aaba35ff7f471f31d64b7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Jan 2013 15:26:25 +0800
Tag:    v2.3.5

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

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

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

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

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

commit 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 4012fc4994339dcbeb72b1c4807d2ed763f84696
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Jan 2013 14:59:41 +0800
Tag:    v2.3.5

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

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

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

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 fdd6de91770194581178f3459d3b15f3822b41ab
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Jan 2013 09:50:54 +0800
Tag:    v2.3.4

Merge branch 'wip-MDL-36367-s23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE

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 7c333e0c6cc7c33dd25b6771b6be2c9a616c250d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 14:46:34 +0800
Tag:    v2.3.4

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

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

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

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

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

commit 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 27b92b4a71ba1b8eb501ad9f61538862645d178b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 11:17:05 +0800
Tag:    v2.3.4

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

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

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

commit 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 3de2dc19e15526a3378dfa59786114fe09227416
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 10:54:24 +0800
Tag:    v2.3.4

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

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

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

commit 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 b943d77cd2c65fab730ddcb688c7ab041ffea95d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 10:31:10 +0800
Tag:    v2.3.4

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

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

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

commit 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 c7ad6f45046303553beee8cb155516ba473e68fb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 10:27:12 +0800
Tag:    v2.3.4

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

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

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

commit 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 053f6ebc427d8247681a66145bce5bfcfeab4f83
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jan 2013 10:24:21 +0800
Tag:    v2.3.4

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

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

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

commit 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 1f1dc87fc18589d68d8aa490984f61fdb8477fd7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Jan 2013 13:57:10 +0800
Tag:    v2.3.4

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

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

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

commit 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 d068c79e483938bf5b666b2d345c16cdaa66d737
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Jan 2013 13:53:29 +0800
Tag:    v2.3.4

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

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

Merge branch 'w51_MDL-36893_m24_mnetestrict' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 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 b0c49cea12a756f5f5c02e59e700ca25a483350d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Jan 2013 13:30:43 +0800
Tag:    v2.3.4

Merge branch 'MDL-27884-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit 9acc49eb937df552bd1bc8aa4fc4f9752e2cb62c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Jan 2013 13:30:34 +0800
Tag:    v2.4.1

Merge branch 'MDL-27884-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE

commit 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 523dafe82452ffd7637b52de7298f487a258db25
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Jan 2013 09:45:15 +0800
Tag:    v2.3.4

Merge branch 'MDL-36667-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

commit 181b7f5fea307c8668aa3e2c4f4fbe2c6bff0a74
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Jan 2013 09:44:59 +0800
Tag:    v2.4.1

Merge branch 'MDL-36667-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE

commit 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 48d53d9fd6ca3d0a2bbb8bce35406d38802198e7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 24 Dec 2012 11:43:41 +0800
Tag:    v2.3.4

Merge branch 'MDL-35569-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE

commit cd665c200d3eade1e741b82a9629ecb4d484aace
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 24 Dec 2012 11:34:55 +0800
Tag:    v2.3.4

Merge branch 'w51_MDL-37233_m23_skype' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit e17644cca34e3d7ad44a92f300f3bffa83950e16
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 24 Dec 2012 11:34:45 +0800
Tag:    v2.4.1

Merge branch 'w51_MDL-37233_m24_skype' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 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 f7128b89bfb3090bbbe4f68c1445a11f3420ab0b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 24 Dec 2012 11:27:02 +0800
Tag:    v2.2.7

Merge branch 'MDL-37146_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit d71b142446bf092abcedd5e81e7a5da5683ac06d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 24 Dec 2012 11:22:48 +0800
Tag:    v2.4.1

Merge branch 'wip-MDL-37263-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit 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 1453ae5bf3bda12273e1dae3916d795e1e55e873
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 24 Dec 2012 10:55:46 +0800
Tag:    v2.2.7

Merge branch 'wip-MDL-37290-m22' of git://github.com/samhemelryk/moodle into MOODLE_22_STABLE

commit 1cb195dabc4a883e9ec13d8fa89848aa76339a9d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 24 Dec 2012 10:55:37 +0800
Tag:    v2.3.4

Merge branch 'wip-MDL-37290-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE

commit b61dd8b29969710b9a70261851dac1bc01c5e8f9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 24 Dec 2012 10:55:24 +0800
Tag:    v2.4.1

Merge branch 'wip-MDL-37290-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit 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 7f44175aedd52b0d362736ca1396f81b762de42b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 24 Dec 2012 10:36:06 +0800
Tag:    v2.2.7

Merge branch 'w51_MDL-37283_m22_spell' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit ca0cbfd4db9c79218a72684e777208d00a4a0af0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 24 Dec 2012 10:35:47 +0800
Tag:    v2.3.4

Merge branch 'w51_MDL-37283_m23_spell' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 41bbc354711be899026417d65a7a459f4bb113dc
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 24 Dec 2012 10:35:40 +0800
Tag:    v2.4.1

Merge branch 'w51_MDL-37283_m24_spell' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 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 a7cc54ab1b78fded7739668f00c8edd45fbff6a2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Dec 2012 14:52:59 +0800
Tag:    v2.2.7

Merge branch 'MDL-37014_webdav_folders_22' of git://github.com/davosmith/moodle into MOODLE_22_STABLE

commit 2ea7723c5353abeaa45d5abbece071f363b98206
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Dec 2012 14:52:41 +0800
Tag:    v2.3.4

Merge branch 'MDL-37014_webdav_folders_23' of git://github.com/davosmith/moodle into MOODLE_23_STABLE

commit eddec247523ca1ce868ddc298d0ac8caa9819f41
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Dec 2012 14:52:33 +0800
Tag:    v2.4.1

Merge branch 'MDL-37014_webdav_folders_24' of git://github.com/davosmith/moodle into MOODLE_24_STABLE

commit 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 60b5ffebf57031fad18932f7cf99c3f10706411d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Dec 2012 14:26:10 +0800
Tag:    v2.3.4

Merge branch 'MDL-36259_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

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 07a01b746cfcb491e2d1d9ec48e89886cc3227f4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Dec 2012 09:11:41 +0800
Tag:    v2.2.7

Merge branch 'MDL-30899_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE

commit 8d8158ea9c93de5922a8eb27a280ba1c0b4f0406
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Dec 2012 09:11:31 +0800
Tag:    v2.3.4

Merge branch 'MDL-30899_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE

commit 2de5b09d8459a79a38a1d2fcdf45ff4ad5f46d32
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Dec 2012 09:11:02 +0800
Tag:    v2.4.1

Merge branch 'MDL-30899_24' of git://github.com/dmonllao/moodle into MOODLE_24_STABLE

commit 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 2e791b966dc618919a137c21feef537a68700674
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Dec 2012 08:45:48 +0800
Tag:    v2.3.4

Merge branch 'MDL-35740-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

commit c3e3fd380dd5168275378e3560b3139e66e43435
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 15:29:18 +0800
Tag:    v2.3.4

Merge branch 'w50_MDL-36493_m23_mysql' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit e8e9393e76c0181c653bd9ce1a55e5bf5d91c0c6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 15:29:07 +0800
Tag:    v2.4.1

Merge branch 'w50_MDL-36493_m24_mysql' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 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 37e91e07318fd9489e0f7122542c085a787a1417
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 15:25:45 +0800
Tag:    v2.2.7

Merge branch 'MDL-37114_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 4dd80797b5a92d169e71db3ea695cec508af15f3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 15:25:30 +0800
Tag:    v2.3.4

Merge branch 'MDL-37114_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

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 9205de2fd828b748d1992ff03476d1524b1ad526
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 13:54:03 +0800
Tag:    v2.2.7

Merge branch 'w50_MDL-36597_m22_courselang' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 5c7c78db26c16e019a39ae8bc820adde801be832
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 13:53:33 +0800
Tag:    v2.3.4

Merge branch 'w50_MDL-36597_m23_courselang' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 973fe984cd51671d87d13f003041241040529c2e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 13:53:06 +0800
Tag:    v2.4.1

Merge branch 'w50_MDL-36597_m24_courselang' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 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 2a243773503ea4aab6daf2d5519f392d8d27af0a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 13:48:36 +0800
Tag:    v2.2.7

Merge branch 'MDL-29334_m22' of git://github.com/markn86/moodle into MOODLE_22_STABLE

commit 8e81a8eb2c349fde9465a08de55a8961a426d9d1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 13:48:25 +0800
Tag:    v2.3.4

Merge branch 'MDL-29334_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE

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 160d3c6b8ad7c44d547690d1cb3349225a38a700
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 12:09:46 +0800
Tag:    v2.3.4

Merge branch 'wip-mdl-36736-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

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 6c974b2d658ccdb0f3d5b16a0aea178d9de588fd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 12:05:26 +0800
Tag:    v2.2.7

Merge branch 'wip-MDL-25928-m22' of git://github.com/samhemelryk/moodle into MOODLE_22_STABLE

commit 0869ef50f09ab34fd353a03ede8655522ca07f11
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 12:05:19 +0800
Tag:    v2.3.4

Merge branch 'wip-MDL-25928-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE

commit da264959f28044fa68560f9f49faae87f36d74af
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 12:05:12 +0800
Tag:    v2.4.1

Merge branch 'wip-MDL-25928-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit 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 dabaa04e2980e0c88d4e0552661024012e6846e5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 11:53:18 +0800
Tag:    v2.2.7

Merge branch 'wip-MDL-35874-stable22' of git://github.com/phalacee/moodle into MOODLE_22_STABLE

commit 12a369728165da3dfc3fb6e65ae0b515ad09f835
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 11:53:08 +0800
Tag:    v2.3.4

Merge branch 'wip-MDL-35874-stable23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE

commit 41e1109c5f3ea3410c8f5a7a55bc62dca8f590c1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 11:52:59 +0800
Tag:    v2.4.1

Merge branch 'wip-MDL-35874-stable24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE

commit 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 1f42fb1443227d16393efa6d68f905305eb91a3b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 11:48:56 +0800
Tag:    v2.2.7

Merge branch 'wip-MDL-35979-s22' of git://github.com/phalacee/moodle into MOODLE_22_STABLE

commit f28b5664eb4535d3e50c1a5c722d0431452b5e86
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 11:48:47 +0800
Tag:    v2.3.4

Merge branch 'wip-MDL-35979-s23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE

commit 209b2f7b3e4b99204b0fa1efa0f53e0c64612c6d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 11:48:39 +0800
Tag:    v2.4.1

Merge branch 'wip-MDL-35979-s24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE

commit 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 bda079183e331575c9da08c51fd98ae8e2a9d5ee
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 11:37:10 +0800
Tag:    v2.3.4

Merge branch 'MDL-37078-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE

commit 503325ddcb833bd5890fa14e99ef42c0b2e2e06e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 11:37:02 +0800
Tag:    v2.4.1

Merge branch 'MDL-37078-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE

commit 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 71c3eff42711bdd07d193bdd7103ab5db9f4b6bd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Dec 2012 11:30:35 +0800
Tag:    v2.3.4

Merge branch 'MDL-37165-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

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 271bfb48b85e76694de5117710cf76e390c7fe17
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 13 Dec 2012 17:43:21 +0800
Tag:    v2.3.4

Merge branch 'MDL-36263-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

commit 25e3fc90aea26eb1eff6c0eb373e8d92283ae7aa
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 13 Dec 2012 13:43:17 +0800
Tag:    v2.2.7

Merge branch 'MDL-36321_message_participants_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit fb7bc97d3e1f49906bb68cb87225cdaebe96cc99
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 13 Dec 2012 10:04:50 +0800
Tag:    v2.2.7

Merge branch 'MDL-36897_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 137d63fe966f8b78abda60afba8254b9548833dc
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 13 Dec 2012 09:55:07 +0800
Tag:    v2.3.4

Merge branch 'MDL-36897_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

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 3c885787c9ee6a148736d059e0129e8b444daa09
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 12 Dec 2012 09:38:15 +0800
Tag:    v2.2.7

Merge branch 'wip-MDL-33448-m22' of git://github.com/samhemelryk/moodle into MOODLE_22_STABLE

commit 9391d2f4cf1c0a86d765082bf58f4428964dbff8
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 12 Dec 2012 09:38:03 +0800
Tag:    v2.3.4

Merge branch 'wip-MDL-33448-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE

commit 8869233e2696a2e7fad84ad6adf2bd893fcd44b8
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 12 Dec 2012 08:44:13 +0800
Tag:    v2.3.4

Merge branch 'm23_MDL-35737' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

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 def17258537b2ca8f347b25e1b5b3df9fea188fe
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 17:54:51 +0800
Tag:    v2.3.4

Merge branch 'w49_MDL-36447_m23_gdtest' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 9261144beb820d54966cba465ebce2b9267296b2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 17:54:37 +0800
Tag:    v2.4.1

Merge branch 'w49_MDL-36447_m24_gdtest' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 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 f69decef933536b9171b6ddfdf2f1dc98e9c0840
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 16:24:42 +0800
Tag:    v2.2.7

Merge branch 'MDL-36243_22' of git://github.com/jmvedrine/moodle into MOODLE_22_STABLE

commit 7350e439bfcb0c8a43309686b250676594ec4e4e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 16:24:34 +0800
Tag:    v2.3.4

Merge branch 'MDL-36243_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE

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 395e4069e1b577dd40fd157d5714b4481e5dedd9
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 16:03:51 +0800
Tag:    v2.2.7

Merge branch 'wip-MDL-36108-stable22' of git://github.com/phalacee/moodle into MOODLE_22_STABLE

commit eba170d8fccef19f9cebd5b934574b20918ff8de
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 16:03:41 +0800
Tag:    v2.3.4

Merge branch 'wip-MDL-36108-stable23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE

commit 865485fc54f44815ec62e8e91c2dea50481c2e7b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 16:03:34 +0800
Tag:    v2.4.1

Merge branch 'wip-MDL-36108-stable24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE

commit 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 7c431a345f13e5edf19b22fb933ddb1f0f04c605
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 15:19:08 +0800
Tag:    v2.4.1

Merge branch 'wip-MDL-36938-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit 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 f2190bac6c4a0f391f503be06c56bed0e0d98309
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 14:01:14 +0800
Tag:    v2.3.4

Merge branch 'MDL-36712-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

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 1ff0a314c94fe93c8a4eed5312768c3ca7ec5685
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 13:57:11 +0800
Tag:    v2.3.4

Merge branch 'MDL-36591-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

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 e93213e2e03248689efa0b7597d78d539639b897
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 13:54:33 +0800
Tag:    v2.2.7

Merge branch 'MDL-36897_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 556f228a9e61a0fa6d43c30fad8ec6dc624efddd
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 13:54:23 +0800
Tag:    v2.3.4

Merge branch 'MDL-36897_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

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 a2f2dbb5dc9c93a1645cb57dba0db03a69c9eec9
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 13:44:01 +0800
Tag:    v2.3.4

Merge branch 'w49_MDL-36685_m23_tablecells' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit f55f2e48ca7b6045c79b087f5a498fdc369d2ca6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 13:23:08 +0800
Tag:    v2.3.4

Merge branch 'MDL-34791-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE

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 1c570f909638b4e070df20d3adfca1d0f6719aa8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 12:19:46 +0800
Tag:    v2.3.4

Merge branch 'MDL-36808-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE

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 fac9ba991b4b3786e707b8ae858b02b7dd4fce85
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 12:09:34 +0800
Tag:    v2.4.1

Merge branch 'w49_MDL-36983_m24_ordertext' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 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 a2577a7cc37fdc169ae51c295d81899b36b736ab
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 12:07:22 +0800
Tag:    v2.3.4

Merge branch 'w49_MDL-36892_m23_enrolreadme' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit ae5ecea065690d44a6ce135db30ec5e1c5e9ffac
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 12:07:13 +0800
Tag:    v2.4.1

Merge branch 'w49_MDL-36892_m24_enrolreadme' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 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 3b36eaac603bc030a58cd5de6d1b3f229b7130d6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 11:59:04 +0800
Tag:    v2.2.7

Merge branch 'MDL-36845_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 957dfed5f2d3c95df57dd6f713d4901f756d47f7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 11:58:54 +0800
Tag:    v2.3.4

Merge branch 'MDL-36845_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

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 f95ba651fcaf594b13463dbb5357da89295707dd
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 11:44:40 +0800
Tag:    v2.3.4

Merge branch 'MDL-36828_23' of https://github.com/aolley/moodle into MOODLE_23_STABLE

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 e89bf76523c61fb7de95282ca39c8688a6f32279
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 11:33:30 +0800
Tag:    v2.2.7

Merge branch 'wip-MDL-36110-s22' of git://github.com/phalacee/moodle into MOODLE_22_STABLE

commit 10c8b7390c9e029ad84e6d1834dd24e9bd0f5cc2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 11:33:22 +0800
Tag:    v2.3.4

Merge branch 'wip-MDL-36110-s23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE

commit 4afa0b50c71b4b1503041afeaaa81de72af09942
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 11:33:14 +0800
Tag:    v2.4.1

Merge branch 'wip-MDL-36110-s24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE

commit 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 5d1dff532e1f22957aaf2ba419c6409cfc2ec0fa
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 11:17:43 +0800
Tag:    v2.3.4

Merge branch 'wip-MDL-35884-s23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE

commit b90b9b83bd61c67386ed1126ab0e392dc2e55c59
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 11:17:33 +0800
Tag:    v2.4.1

Merge branch 'wip-MDL-35884-s24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE

commit 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 3f358a021b805c7dbfb4eea58250768dad5a36cb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 11:07:43 +0800
Tag:    v2.3.4

Merge branch 'MDL-36025-negative-zero-MOODLE_23_STABLE' of git://github.com/mpetrowi/moodle into MOODLE_23_STABLE

commit 12a90d7af0047d36bcd1443b9122ab29f26f2cfa
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 11:06:59 +0800
Tag:    v2.2.7

Merge branch 'MDL-36025-negative-zero-MOODLE_22_STABLE' of git://github.com/mpetrowi/moodle into MOODLE_22_STABLE

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 b2fa6cfa93286f0a11d91db5e00045c68f59c7e7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 10:39:42 +0800
Tag:    v2.3.4

Merge branch 'MDL-34052-23' of https://github.com/damyon/moodle into MOODLE_23_STABLE

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 8f647f1d3aefbfbab40a5db096027293ebb6bbf4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 10:31:44 +0800
Tag:    v2.3.4

Merge branch 'w49_MDL-31424_m23_paypalcase' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit fddbdb79db922fcb26bcb9f07a18ca2c4c300de0
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 10:31:36 +0800
Tag:    v2.4.1

Merge branch 'w49_MDL-31424_m24_paypalcase' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 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 4c34df5e5c62a162f4abdc5d0d11c37c143f46b1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 09:56:58 +0800
Tag:    v2.2.7

Merge branch 'MDL-36773-22' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit 14802ee558b32773ced0909eaf3b4adb586ca6ce
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Dec 2012 09:56:47 +0800
Tag:    v2.3.4

Merge branch 'MDL-36773-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE

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 1423ab37092b0e1666b83a9601ad2ca81cf60a3f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 19:37:41 +0800
Tag:    v2.3.4

Merge branch 'w49_MDL-36737_m23_glossstrict' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 86e28894f4060b4b7cb459181c8b0cad99eec281
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 19:37:31 +0800
Tag:    v2.4.1

Merge branch 'w49_MDL-36737_m24_glossstrict' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 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 c125bb553d911556db7f219d5b9cb2723ca8aeaf
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 19:33:21 +0800
Tag:    v2.4.1

Merge branch 'MDL-36755_master' of git://github.com/markn86/moodle into MOODLE_24_STABLE

commit 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 ae4e512f665ab3d8703b01f95e38baa180684da2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 17:32:30 +0800
Tag:    v2.3.4

Merge branch 'MDL-36167-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

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 6c0bdc4d58ebdc49b4920569afca303ed180dc32
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 15:18:34 +0800
Tag:    v2.2.7

Merge branch 'MDL-36732_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit b0473b9bf0c8958fd1534dcbfb0021d92dc6ac21
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 15:18:24 +0800
Tag:    v2.3.4

Merge branch 'MDL-36732_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

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 b93c5e3ed9ad1980fe19c54366097f105ab40d7c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 14:41:57 +0800
Tag:    v2.2.7

Merge branch 'MDL-36742_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 8bd7536090fa9fe7e46ffb34bd3758542370ef2f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 14:41:48 +0800
Tag:    v2.3.4

Merge branch 'MDL-36742_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 870d2fff8ea0c6bc093fcd2261fc8169a4ad944c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 14:19:10 +0800
Tag:    v2.3.4

Merge branch 'MDL-36549_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

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 66586db2244c98523f64b673959a7e96844c5efe
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 14:02:24 +0800
Tag:    v2.3.4

Merge branch 'MDL-36835-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

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 f5c44fd0538d013e1def04a587ec4b18a7cb1647
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 13:13:20 +0800
Tag:    v2.2.7

Merge branch 'MDL-36538_webdav_memory_22' of git://github.com/davosmith/moodle into MOODLE_22_STABLE

commit d4d6cce5004f8f428e6f334d0c93283f580b16e1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 13:13:11 +0800
Tag:    v2.3.4

Merge branch 'MDL-36538_webdav_memory_23' of git://github.com/davosmith/moodle into MOODLE_23_STABLE

commit 71e8ee1c33a1b5cf7d2516e2e2b1cd6bf26b7088
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 13:13:03 +0800
Tag:    v2.4.1

Merge branch 'MDL-36538_webdav_memory_24' of git://github.com/davosmith/moodle into MOODLE_24_STABLE

commit 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 9d95db7ecd8d9df1d7472419ebda570f62355da8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 12:03:57 +0800
Tag:    v2.2.7

Merge branch 'w49_MDL-35456_m22_paypal' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 6078f84d9f51ae068e49313b3196a7f6b1da46e9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 12:03:33 +0800
Tag:    v2.3.4

Merge branch 'w49_MDL-35456_m23_paypal' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 8938f0848e54d82eb5be1e01f64f255317bcaed8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 12:03:23 +0800
Tag:    v2.4.1

Merge branch 'w49_MDL-35456_m24_paypal' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 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 146e1cd674e6d5c0541b0a2b69a322a047514799
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 11:37:00 +0800
Tag:    v2.2.7

Merge branch 'MDL-35404_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 8ffe246d69885e5669dc4fd5fdd1297fbbf1ff07
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 11:36:49 +0800
Tag:    v2.3.4

Merge branch 'MDL-35404_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

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 9321379b100ef2860d7a9eddfd28abfb0da55595
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 11:08:51 +0800
Tag:    v2.4.1

Merge branch 'wip-MDL-36939-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit 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 1197b6163a21e1c1d124f81bf0813f7a4e3231ed
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Dec 2012 09:57:10 +0800
Tag:    v2.3.4

Merge branch 'MDL-36680_hidden_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

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

commit 9b1f784178e7134a1c9701802d45791d9a58e5a9
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 06 Dec 2012 12:04:08 +0800
Tag:    v2.4.1

Merge branch 'wip-MDL-36960-m24' of git://github.com/amygroshek/moodle into MOODLE_24_STABLE

commit 0c767bf6cc75b598551495b4886b55cd784bcf97
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 06 Dec 2012 10:57:13 +0800
Tag:    v2.4.1

Merge branch 'MDL-36963-deployment-backup_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE

commit bb608148a9e542ed4f0cdd4962d49a3e1b055747
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Dec 2012 15:21:25 +0800
Tag:    v2.4.0

Merge branch 'MDL-36950-updates-proxy' of git://github.com/mudrd8mz/moodle

commit b17858f9915d369eb29fdf32caef788c4de876e2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Dec 2012 14:45:49 +0800
Tag:    v2.3.4

Merge branch 'MDL-36914-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

commit e1c93ed97be73415bd27ba59e751b17cc5197284
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Dec 2012 14:45:04 +0800
Tag:    v2.4.0

Merge branch 'MDL-36914-master' of git://github.com/damyon/moodle

commit 7d1c3abe88906b639d48fcd8ba3d823fb2eab76a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Dec 2012 14:08:25 +0800
Tag:    v2.4.0

Merge branch 'MDL-36883-master' of git://github.com/FMCorz/moodle

commit 7eebac6c77c1a3db2120ef778aa92526e750802f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Dec 2012 13:56:21 +0800
Tag:    v2.4.0

Merge branch 'MDL-36860-master' of git://github.com/FMCorz/moodle

commit 72647f09f100cbb446a6fb3ce6abd569547326e0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Dec 2012 13:41:02 +0800
Tag:    v2.4.0

Merge branch 'MDL-36944-master' of git://github.com/FMCorz/moodle

commit 539cc4061d3f4dc62c08b80f837a5bddd0c1b130
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Dec 2012 13:28:12 +0800
Tag:    v2.4.0

Merge branch 'MDL-36949-master' of git://github.com/FMCorz/moodle

commit 4a67095710a69440c5c961275e70c6ffe773a9f5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Dec 2012 13:23:21 +0800
Tag:    v2.4.0

Merge branch 'MDL-36884-master' of git://github.com/FMCorz/moodle

commit c62c77c0e89dc4e1611fad26e89b1535bb5fa8ad
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Dec 2012 12:55:42 +0800
Tag:    v2.4.0

Merge branch 'wip-MDL-36888-m24' of git://github.com/samhemelryk/moodle

commit f92340ed3f36300cb065e2b0afd0457d8cf86abc
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Dec 2012 11:59:01 +0800
Tag:    v2.4.0

Merge branch 'MDL-36948-master' of git://github.com/FMCorz/moodle

commit 28ef36f018003af8a530ddc5a1536e43491c87bb
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Dec 2012 10:36:16 +0800
Tag:    v2.4.0

Merge branch 'MDL-36618-master' of git://github.com/FMCorz/moodle

commit 6b003f12eb5f64936a6033eb01afa3f5f47369ae
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 30 Nov 2012 09:48:36 +0800
Tag:    v2.4.0-rc1

Merge branch 'wip-MDL-36937-m24' of git://github.com/samhemelryk/moodle

commit e4d7ec6b3be4fe9ddb87fe1b777b3ec6b4d2c399
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 29 Nov 2012 15:06:19 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36783-master' of git://github.com/FMCorz/moodle

commit 7dd36747087b9dc56fdc65a18ad6dbc5ca2acf48
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 29 Nov 2012 14:53:11 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36638-master' of git://github.com/FMCorz/moodle

commit 4f847182e61a418008a3950551b9902286f2de31
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 29 Nov 2012 14:43:50 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36839-master' of git://github.com/FMCorz/moodle

commit 88ee671baed967ce579561a6f9a20daf221e5681
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 29 Nov 2012 12:51:00 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36718-master' of git://github.com/FMCorz/moodle

commit 694b2e20bbb293c1e677d10dc73402ca46fa5726
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 29 Nov 2012 12:21:03 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36695-master' of git://github.com/FMCorz/moodle

commit b58d1b9b1ca6bc5fd4e18dd6a9289dbde2c28318
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 28 Nov 2012 17:51:33 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36782-master' of git://github.com/FMCorz/moodle

commit c993fe8d88da6137fbdbd764b6c426b59b5ec664
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 28 Nov 2012 17:36:20 +0800
Tag:    v2.2.7

Merge branch 'MDL-36838-FF17-MNETSSO-22' of git://github.com/peterbulmer/moodle into MOODLE_22_STABLE

commit 78601ea6fe40dc48eb40370fa299cdaea3b29fe2
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 28 Nov 2012 17:36:09 +0800
Tag:    v2.3.4

Merge branch 'MDL-36838-FF17-MNETSSO-23' of git://github.com/peterbulmer/moodle into MOODLE_23_STABLE

commit 6f24d3183e96b00c5645333624c84d4a704136d3
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 28 Nov 2012 17:35:54 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36838-FF17-MNETSSO-MASTER' of git://github.com/peterbulmer/moodle

commit a38a5cefb31a921bb4ff35bb00c04e26908d44d7
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 28 Nov 2012 14:15:41 +0800
Tag:    v2.3.4

Merge branch 'MDL-35966-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

commit 0c21bb606b7ba470a3d1f77ea44ea25fbd4bfd48
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 28 Nov 2012 14:15:28 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-35966-master' of git://github.com/damyon/moodle

commit 2e15e63a31bdcf65ae031251042b7c6a6f5c6f34
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 28 Nov 2012 14:14:49 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36864_master' of git://github.com/markn86/moodle

commit bd80fcc3579d8dcf120edbc82dc9ef4c08ceece2
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 28 Nov 2012 09:56:59 +0800
Tag:    v2.4.0-rc1

Merge branch 'wip-MDL-36859-m24' of git://github.com/samhemelryk/moodle

commit ab690341b23a04f932f2a41c628dd104f09e99c3
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 28 Nov 2012 09:41:30 +0800
Tag:    v2.3.4

Merge branch 'MDL-36752-MOODLE_23_STABLE-2' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE

commit 1d762c8aba9a918ba2434100e3f43197875f750c
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 28 Nov 2012 09:40:24 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36752-master-2' of git://git.luns.net.uk/moodle

commit 9c8969a371f0bd725fa7ff4fcaf713b5625b90af
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Nov 2012 15:26:18 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36629-master' of git://github.com/FMCorz/moodle

commit 19fad758a1f2c4383d9d63d61882d5559e47758c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Nov 2012 14:23:52 +0800
Tag:    v2.2.7

Merge branch 'MDL-34695_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit c9368a425aa31c247b398199a3435d454e0906d1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Nov 2012 14:23:44 +0800
Tag:    v2.3.4

Merge branch 'MDL-34695_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit 908957bc25b72188278e0071f2b72f9c49424275
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Nov 2012 14:23:29 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-34695' of git://github.com/rwijaya/moodle

commit 6a992d7d86bee13da7e789cd5c051eb08248ca69
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Nov 2012 14:10:14 +0800
Tag:    v2.2.7

Merge branch 'MDL-36302-22' of git://github.com/damyon/moodle into MOODLE_22_STABLE

commit db7f46ad3adf4cb44cdc81d2a814e50c294722d5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Nov 2012 14:10:06 +0800
Tag:    v2.3.4

Merge branch 'MDL-36302-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

commit 0fa3d61d20b38f128c1e18e5f88d51c794a1572e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Nov 2012 14:09:56 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36302-master' of git://github.com/damyon/moodle

commit a6d3387c3abf29d8e6cf5915a1612e8a82efba0f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Nov 2012 14:01:04 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36782-master' of git://github.com/FMCorz/moodle

commit 89ac5e87821b7b1e469b6b5726c3e679ce0ed1fb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Nov 2012 13:58:29 +0800
Tag:    v2.3.4

Merge branch 'MDL-36184-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

commit db0b3c507806b28adde49201d426e84303b65a8a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Nov 2012 13:58:20 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36184-master' of git://github.com/damyon/moodle

commit 4554660c28277267323e5c5797414e57e4f6ba7d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Nov 2012 13:38:53 +0800
Tag:    v2.4.0-rc1

Merge branch 'wip-MDL-36466-m24' of git://github.com/samhemelryk/moodle

commit f95fb4b6006819391e6c6ce5baa0e19bd1475897
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Nov 2012 13:37:49 +0800
Tag:    v2.4.0-rc1

Merge branch 'wip-MDL-36825-m24' of git://github.com/samhemelryk/moodle

commit 148c786f7c0b6553b481f31f82f467bd65238c23
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Nov 2012 13:32:47 +0800
Tag:    v2.3.4

Merge branch 'MDL-36752-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE

commit e0c9b42ff74cc479def5c74a258b34b63a094734
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Nov 2012 13:32:34 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36752-master' of git://git.luns.net.uk/moodle

commit 24d215d3404d84faadbc4083f69a8da4374fd8d8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Nov 2012 13:26:54 +0800
Tag:    v2.2.7

Merge branch 'MDL-36806_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 6ac0d92d5ba510eee5c927554d7b86abf9abb528
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Nov 2012 13:26:46 +0800
Tag:    v2.3.4

Merge branch 'MDL-36806_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 513c64c30355c508cf740023ed57a1af9ef5b893
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Nov 2012 13:26:38 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36806' of git://github.com/timhunt/moodle

commit f285889157798fd19fd531c143e9a769627b6bd9
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Nov 2012 13:18:20 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36442_master' of git://github.com/lazydaisy/moodle

commit e7705abddebfc458ac40dcaf96a7d09db4450eb1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Nov 2012 13:10:27 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36775-master' of git://github.com/FMCorz/moodle

commit 5d6aca6e1ab9a8d510ca9a91b4d6c867f06b8d67
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Nov 2012 13:06:32 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36784-master' of git://github.com/FMCorz/moodle

commit 23510ab2e8b15d6d5ec0adff1c3dbba08d7ce5ab
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Nov 2012 13:00:44 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36550-master' of git://github.com/FMCorz/moodle

commit dcb58f9d066209d55141e199aea0258274eb70c2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Nov 2012 12:14:05 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36802-master' of git://github.com/FMCorz/moodle

commit 783c4779dfed8069c8ca56cfa6c7141d7bb87c81
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Nov 2012 11:55:21 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36636-master' of git://github.com/FMCorz/moodle

commit f6399f7547e903942352346bedc3313cdca24094
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Nov 2012 11:39:21 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36631-master' of git://github.com/FMCorz/moodle

commit e8d7f57e8ccac66bd326e432ffc4fa02ae706063
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Nov 2012 11:25:10 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36630-master' of git://github.com/FMCorz/moodle

commit 8204e5730975e8de75406006f3e62b62634e646e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Nov 2012 10:50:31 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36559-master-int' of git://github.com/FMCorz/moodle

commit 981f72be5eda0fb297929c2a80d219bd84fb9a20
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Nov 2012 10:40:24 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36623-master-int' of git://github.com/FMCorz/moodle

commit 2c59d2ca8c29cb548e3245392d50d2da5786da58
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Nov 2012 10:36:59 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36550-master' of git://github.com/FMCorz/moodle

commit 713a49298f4b6c95b69ec4601180a604b7b8c49a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Nov 2012 10:10:04 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36628-master' of git://github.com/FMCorz/moodle

commit 939a43e426e2a2a3676d1b30f09cce0e2cc5395b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Nov 2012 12:07:04 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-35717-quiz-attempt-checkstate' of git://github.com/mpetrowi/moodle

commit b4272e0005c99178366e6c46b2fb61588fa4f01a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Nov 2012 11:42:35 +0800
Tag:    v2.4.0-rc1

Merge branch 'wip-MDL-36066-master' of git://github.com/marinaglancy/moodle

commit e5f91ef230551c7f2feadbdd52cd71fefd1d4a4e
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 23 Nov 2012 15:16:01 +0800
Tag:    v2.1.10

Merge branch 'install_21_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_21_STABLE

commit e5b945e956b33b85a065e75c33ec3dd860d1753d
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 23 Nov 2012 15:15:39 +0800
Tag:    v2.2.7

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit 0d80d00494bea8d362738b97e413a236dd11c201
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 23 Nov 2012 15:12:29 +0800
Tag:    v2.3.4

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit 62022cb553dc6f98c78316148f70a5dd356b5976
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 23 Nov 2012 15:11:14 +0800
Tag:    v2.4.0-rc1

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit 9a27ce00b89dcea95eaefed65257e01cd474be05
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 23 Nov 2012 11:28:51 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36204-files-with-spaces' of git://github.com/mudrd8mz/moodle

commit 79d7cda9e54e1b75dbe23fd072dd10a7f2214d7e
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 23 Nov 2012 11:20:27 +0800
Tag:    v2.2.7

Merge branch 'MDL-36204-files-with-spaces_22' of git://github.com/mudrd8mz/moodle into MOODLE_22_STABLE

commit cc00f721d164c41c54441c977268548c5e7a5985
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 23 Nov 2012 11:20:04 +0800
Tag:    v2.3.4

Merge branch 'MDL-36204-files-with-spaces_23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE

commit bf0aa894bdffbefd35c9e3d52a409dddd634cdf5
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 22 Nov 2012 10:33:47 +0800
Tag:    v2.2.7

Merge branch 'wip-MDL-36668-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit 64ae757ee523ef7ba81b0280a7eaa2607e93d249
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 22 Nov 2012 10:33:15 +0800
Tag:    v2.3.4

Merge branch 'wip-MDL-36668-MOODLE_23_STABLE' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE

commit a9962a85331e26725a68c1c6b56d875f4b976a5e
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Nov 2012 16:13:21 +0800
Tag:    v2.4.0-rc1

Merge branch 'w47_MDL-36743_m24_blognotice' of git://github.com/skodak/moodle

commit 2048b8e2c797f6245a9ed5a426b37ec7c3bab785
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Nov 2012 15:58:19 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36470-master' of git://github.com/FMCorz/moodle

commit 5b93fb114c818f2a40253fb4eb2d2435a7fbbb81
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Nov 2012 15:44:34 +0800
Tag:    v2.4.0-rc1

Merge branch 'w47_MDL-36211_m24_sesslocking' of git://github.com/skodak/moodle

commit bbeafdbed10e456d0ba69f1d424b646cd7280fcd
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Nov 2012 15:34:22 +0800
Tag:    v2.3.4

Merge branch 'w47_MDL-36547_m23_sectiongen' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 1b019095979073040a5ed302a9f6c845ab265da7
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Nov 2012 15:26:15 +0800
Tag:    v2.4.0-rc1

Merge branch 'w47_MDL-36547_m24_sectiongen' of git://github.com/skodak/moodle

commit d59c0d7094b2bb159c505ed8fb5e7b7ea171cce9
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Nov 2012 15:19:32 +0800
Tag:    v2.2.7

Merge branch 'MDL-30884_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 105562e68286baa52e25a2d555e040710409a09d
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Nov 2012 15:19:24 +0800
Tag:    v2.3.4

Merge branch 'MDL-30884_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 38661951555618b13d50526df8c5d9bcb441f3b4
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Nov 2012 15:19:15 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-30884' of git://github.com/timhunt/moodle

commit e5556885ebc80330d3a4cf06dcf164ff90d7f5d3
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Nov 2012 15:15:23 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36639-master-int' of git://github.com/FMCorz/moodle

commit c9f5160438b7fe5dab5460184854cbabd385e56f
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Nov 2012 13:48:04 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36720-updates-via-https' of git://github.com/mudrd8mz/moodle

commit edd08683b9789b459709bf0f15ec5927fcf07ee3
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Nov 2012 12:03:13 +0800
Tag:    v2.2.7

Merge branch 'MDL-35675-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit c41d292bce2ee9153fe00493300b99c735c792c0
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Nov 2012 12:02:58 +0800
Tag:    v2.3.4

Merge branch 'MDL-35675-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 8068fcb5b615a09b34e325777f25f42d4b9f3066
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Nov 2012 12:02:48 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-35675-master' of git://github.com/FMCorz/moodle

commit 19d964e07ace4ef28dc9571d7449bff4acc1d5ca
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Nov 2012 12:01:03 +0800
Tag:    v2.3.4

Merge branch 'MDL-36289-m23' of git://github.com/netspotau/moodle-mod_assign into MOODLE_23_STABLE

commit 77f948a2f778229091997af6550e04529349cabe
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Nov 2012 12:00:28 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36289' of git://github.com/netspotau/moodle-mod_assign

commit 31112f3babc6274ac73912c5f733dd46b96f552d
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Nov 2012 11:56:44 +0800
Tag:    v2.4.0-rc1

Merge branch 'w47_MDL-36211_m24_sesslocking' of git://github.com/skodak/moodle

commit f890a6a9f9bdcf59bbb714c2efac83c69d5dce6a
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Nov 2012 11:53:36 +0800
Tag:    v2.2.7

Merge branch 'MDL-30377_m22' of git://github.com/markn86/moodle into MOODLE_22_STABLE

commit 8fb4c6e7c375306c51921e4f429e48df52b9d9f4
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Nov 2012 11:53:21 +0800
Tag:    v2.3.4

Merge branch 'MDL-30377_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE

commit e4837b8a25c435a5a63e1431accdd7f9c3af3ac1
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Nov 2012 11:52:32 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-30377_master' of git://github.com/markn86/moodle

commit 2c9280ffa63ca2bd279dc479feb40f6774c08ceb
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Nov 2012 11:47:47 +0800
Tag:    v2.2.7

Merge branch 'MDL-36170_m22' of https://github.com/jfilip/moodle into MOODLE_22_STABLE

commit 97c7facfe0576bf085c29b7ba9f3ffc1dcc07e25
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Nov 2012 11:47:39 +0800
Tag:    v2.3.4

Merge branch 'MDL-36170_m23' of https://github.com/jfilip/moodle into MOODLE_23_STABLE

commit 77307db20874d308a76f120c3ac78ace5240b02d
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Nov 2012 11:47:17 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36170_master' of https://github.com/jfilip/moodle

commit 01d8f54dbd339390c8fd6951a135c36a2a643168
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 16:16:54 +0800
Tag:    v2.2.7

Merge branch 'MDL-33863_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 3ec8f9f74aa752626a622d1af86b032fbcb8704a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 16:16:41 +0800
Tag:    v2.3.4

Merge branch 'MDL-33863_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit c796b506be39c879876cb37f7a0e71c7410383d9
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 16:15:16 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-33863' of git://github.com/timhunt/moodle

commit 7a12ad128677a5a489bfe732c5e69c978702a6bd
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 16:09:49 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36634-master' of git://github.com/FMCorz/moodle

commit 3a31c0349aede7d5cd91c6ae0fc820473c98b731
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 16:07:59 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36624-master-int' of git://github.com/FMCorz/moodle

commit 30e0a6e5ba93f60e84bc8947be49552313058fc8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 16:06:08 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36659-master' of git://github.com/FMCorz/moodle

commit 728b702f4e5947b0721c55d83d5862e7a7f3594a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 16:04:19 +0800
Tag:    v2.3.4

Merge branch 'MDL-36022-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE

commit dab8ed3b24158e37320184b17e4c756c70c08a19
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 16:04:08 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36022-master' of git://git.luns.net.uk/moodle

commit bdd377906423d9f52e64726a830eea9607888e7f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 16:01:41 +0800
Tag:    v2.4.0-rc1

Merge branch 'w47_MDL-36703_m24_enrolgenerator' of git://github.com/skodak/moodle

commit 109473368d404ebdc5972202d798b9cd589fa9e6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 15:57:53 +0800
Tag:    v2.4.0-rc1

Merge branch 'm24_MDL-36142_Incorrect_query_returns_HTTP_404' of https://github.com/scara/moodle

commit 81c8cccf6c89f35e58c0279e372438f427930ac1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 15:31:46 +0800
Tag:    v2.2.7

Merge branch 'MDL-30731-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit a91c6103f3de7d6af41244242058242065eac976
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 15:31:38 +0800
Tag:    v2.3.4

Merge branch 'MDL-30731-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit f132526512413bf91de0d07bf8cd233f50011a1c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 15:31:27 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-30731-master' of git://github.com/FMCorz/moodle

commit 3d51f11c9af34899bc6dd7a523bde4bf90969944
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 15:25:20 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36679-master' of github.com:damyon/moodle

commit 9d1989daa7d7f7b8ad4145186b37aa6a8294476b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 15:15:43 +0800
Tag:    v2.4.0-rc1

Merge branch 'wip-MDL-35678-master' of git://github.com/abgreeve/moodle

commit 0299d83bc0bc70d965925f957ac543a63d4513c0
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 15:12:00 +0800
Tag:    v2.3.4

Merge branch 'MDL-36646_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 430f5aaac0aba49f326f537f41815be73b2e25e1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 15:06:21 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36646' of git://github.com/timhunt/moodle

commit 941cf79fdcb920c8936b9360c24a5aae8951698b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 15:03:39 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36613-master' of git://github.com/FMCorz/moodle

commit 6330424fae92480ef4d44dbe742ffa81565766e6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 15:01:46 +0800
Tag:    v2.2.7

Merge branch 'MDL-36571_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 254d78b75f78aea6d8d1c944f232e4fb9735608d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 15:01:38 +0800
Tag:    v2.3.4

Merge branch 'MDL-36571_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 91b0d0b75a330c9329732701562ebf641eb38439
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 14:59:34 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36571' of git://github.com/timhunt/moodle

commit 4dc87c7730a8532e86d16d4e343ea9003be397fc
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 14:46:54 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36564-master-int' of git://github.com/FMCorz/moodle

commit 21082f7aed63f22338767caea2c336bf71274042
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 14:45:04 +0800
Tag:    v2.3.4

Merge branch 'MDL-36548_23' of git://github.com/pauln/moodle into MOODLE_23_STABLE

commit 7a39c933b904f48619b10ddfb422b106e45a11d2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 14:44:35 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36548_master' of git://github.com/pauln/moodle

commit 5b646bdc6cf5c51cf41f4188721ee2bc07833581
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 14:36:53 +0800
Tag:    v2.4.0-rc1

Merge branch 'wip-MDL-36544-m24' of github.com:amygroshek/moodle

commit f7f7cf77603c5f2417d7bed1996510528e279272
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 14:32:14 +0800
Tag:    v2.2.7

Merge branch 'wip-MDL-36453-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit d7aec7342db2bddd3b826bd915bef4964fe12997
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 14:32:05 +0800
Tag:    v2.3.4

Merge branch 'wip-MDL-36453-MOODLE_23_STABLE' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE

commit f2e1d671a9f9888b65a03ae9cfe8aa1021219261
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 14:31:53 +0800
Tag:    v2.4.0-rc1

Merge branch 'wip-MDL-36453-master' of git://github.com/abgreeve/moodle

commit f45ecda7f90ae9bb104cd205c6c64eea2a9dfd16
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 12:48:22 +0800
Tag:    v2.4.0-rc1

Merge branch 'w47_MDL-36229_m24_crawl' of git://github.com/skodak/moodle

commit 521225275bb92f7b6e8913a90be005d8aa40f016
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 12:45:58 +0800
Tag:    v2.2.7

Merge branch 'MDL-36204_22' of git://github.com/pauln/moodle into MOODLE_22_STABLE

commit d338726097ed888e6661bee140d6120b1c28bfb6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 12:45:32 +0800
Tag:    v2.3.4

Merge branch 'MDL-36204_23' of git://github.com/pauln/moodle into MOODLE_23_STABLE

commit e741c4e4c0eba9c8035ba8f37aad5516258e85bc
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 12:45:08 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36204_master' of git://github.com/pauln/moodle

commit 81d1026d1c6c4fb1d4f23df13a71007356c8319c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 12:38:33 +0800
Tag:    v2.3.4

Merge branch 'm23_MDL-36168' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

commit 1d907ae61e9f437a879141f0cc76c71ec70be6a1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 12:38:23 +0800
Tag:    v2.4.0-rc1

Merge branch 'master_MDL-36168' of git://github.com/danmarsden/moodle

commit aaf19f1ca35f9be3d061d7e60c454af776e81bfb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 12:28:59 +0800
Tag:    v2.3.4

Merge branch 'MDL-35158-23' of git://github.com/grabs/moodle into MOODLE_23_STABLE

commit 7b83e3019d475f0478af9310743d83f6697ad989
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 12:28:49 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-35158-master' of git://github.com/grabs/moodle

commit 80b7e5deb64b5ca871c32e18c5d4df4ce1754998
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 12:05:55 +0800
Tag:    v2.2.7

Merge branch 'MDL-32865_22' of git://github.com/jmvedrine/moodle into MOODLE_22_STABLE

commit 042a79870c411702e3104c9a14aa07b1fcbcecb7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 12:05:46 +0800
Tag:    v2.3.4

Merge branch 'MDL-32865_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE

commit 56eaaecfa26f456c67f5392219f29b4171481aab
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 12:05:36 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-32865' of git://github.com/jmvedrine/moodle

commit e4b6c671ace7cf4b0c52a293c580eb886ad84a0c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 11:53:36 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-32806_master' of git://github.com/lazydaisy/moodle

commit 881f49841b15e4060de07b202ee26eba23fb00c6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 11:50:11 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-31847_master' of git://github.com/lazydaisy/moodle

commit 774530f8b4d9a7475983f7c24de9784af1f1e762
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 11:47:36 +0800
Tag:    v2.2.7

Merge branch 'MDL-30871-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit e81c1ad9871d199049096bcd0aa1aeaca6bf610f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 11:47:26 +0800
Tag:    v2.3.4

Merge branch 'MDL-30871-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 86ebf415455d2f1f1437cd73b799d0a0fcf5936e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 11:47:17 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-30871-master' of git://github.com/FMCorz/moodle

commit f2b98405858c461c8b866d7a39a7a5892dc84bae
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 11:21:00 +0800
Tag:    v2.2.7

Merge branch 'MDL-26439_message_search_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 04821272abd4e43857ac5e3a0faf58b4274c6bfd
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 11:20:51 +0800
Tag:    v2.3.4

Merge branch 'MDL-26439_message_search_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit 32f741edea947e66b24c54fa0119d2e49ded5341
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 11:20:43 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-26439_message_search' of git://github.com/andyjdavis/moodle

commit 358f8debded597f039905fb9ae81ec575ce46a60
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Nov 2012 00:03:56 +0800
Tag:    v2.3.4

Merge branch 'MDL-36696-MOODLE_23_STABLE' of git://github.com/mrverrall/moodle into MOODLE_23_STABLE

commit 21c255093d4374c24bff08805774bc82ba058f31
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Nov 2012 15:01:54 +0800
Tag:    v2.3.4

Merge branch 'MDL-36655-m23' of git://github.com/netspotau/moodle-mod_assign into MOODLE_23_STABLE

commit 1ffe4aefb1c4914ce7ac8a20bc607c1595da5ab9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Nov 2012 15:01:48 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36655' of git://github.com/netspotau/moodle-mod_assign

commit 98d11a8c835de5b22e1635d1595d008d84054e8e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Nov 2012 14:50:48 +0800
Tag:    v2.4.0-rc1

Merge branch 'w47_MDL-36682_m24_mcache' of git://github.com/skodak/moodle

commit 1ae8e2f963ccb374fbce2172bad80e015dad818e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Nov 2012 10:51:54 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36415-master-int' of git://github.com/FMCorz/moodle

commit 682661d87a0587321d86bc579e07eec833f827c0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Nov 2012 10:33:31 +0800
Tag:    v2.3.4

Merge branch 'MDL-34204_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 380186484b66738439a40e1d3648fe5d283453ff
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Nov 2012 10:33:25 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-34204' of git://github.com/timhunt/moodle

commit 542f68b022fe56adfc440a49d3959f2b68e2e683
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Nov 2012 10:20:00 +0800
Tag:    v2.4.0-rc1

Merge branch 'm24_MDL-36512_Purging_file_cachestore_does_not_purge_anything' of https://github.com/scara/moodle

commit 381230cc7019956e29a1972e20f47c94ec1c540f
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 16 Nov 2012 16:25:59 +0800
Tag:    v2.4.0-rc1

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit f2bd07e54da921bbbd4cc41d78540e6d4c17be5c
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 16 Nov 2012 15:33:29 +0800
Tag:    v2.2.7

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit 099c7f61da1f09565f009fe4046904a0b22b59c7
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 16 Nov 2012 15:32:33 +0800
Tag:    v2.3.4

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit bc8f1957a433e505539d0b60e3ed6c4e8da236b1
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 16 Nov 2012 15:24:24 +0800
Tag:    v2.4.0-rc1

Merge branch 'm24_MDL-36364_Improve_the_deletion_logic' of https://github.com/scara/moodle

commit aeb8e7878513e234c98a5b7e95071bad3358a243
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 16 Nov 2012 15:04:17 +0800
Tag:    v2.4.0-rc1

Merge branch 'wip-MDL-36407-m24' of git://github.com/samhemelryk/moodle

commit c941aafebbd588e885299e3401b3511f6288fb24
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 16 Nov 2012 14:52:09 +0800
Tag:    v2.4.0-rc1

Merge branch 'wip-MDL-36276-m24' of git://github.com/samhemelryk/moodle

commit 716bf54332105a5c350f0e51ca26173078a78446
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 16 Nov 2012 14:49:44 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36525-master' of git://github.com/ankitagarwal/moodle

commit 5d4f65e6dfcba5c7c6292cc52782df9af13e6faf
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 16 Nov 2012 12:16:31 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36471-master-int' of git://github.com/FMCorz/moodle

commit 2a594e13b1430fd7aa4a58887608a73690ebe305
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 16 Nov 2012 11:03:45 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36612-master-int' of git://github.com/FMCorz/moodle

commit 44411fdb0c426a71c91a24cf77792a02dd17b966
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 16 Nov 2012 11:01:53 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36471-master-int' of git://github.com/FMCorz/moodle

commit e8feeb2ca2202f4f2bd57e478f2c3d0438df1910
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 16 Nov 2012 10:57:16 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36622-master' of git://github.com/FMCorz/moodle

commit 98504eb6098fb15f0477d8cf9bff0e1dc00f1a7a
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 16 Nov 2012 10:52:07 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36643-master' of git://github.com/FMCorz/moodle

commit e7468fb2edc8b36a7b759d7dc635cb437e86834f
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 15 Nov 2012 16:26:26 +0800
Tag:    v2.4.0-rc1

Merge branch 'wip-MDL-35770-master' of git://github.com/marinaglancy/moodle

commit 7aaece91a360d5c15ff9c929d6f9fc0db84ac10d
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 15 Nov 2012 14:41:07 +0800
Tag:    v2.2.7

Merge branch 'MDL-36331_redirect_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 43c6aa915e45eb0def7f2203790c63a5a0d7f1e9
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 15 Nov 2012 14:40:56 +0800
Tag:    v2.3.4

Merge branch 'MDL-36331_redirect_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit 391678f6fac7eed1e8856e977175697bdb2fe4b8
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 15 Nov 2012 14:40:42 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36331_redirect' of git://github.com/andyjdavis/moodle

commit f73a13198012333830031c2e2e0ddb43c29720dc
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 15 Nov 2012 14:32:59 +0800
Tag:    v2.3.4

Merge branch 'MDL-36061_userid_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit 491391873edf7ede948d6c2e33f201fde0d1bc5a
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 15 Nov 2012 14:32:51 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36061_userid' of git://github.com/andyjdavis/moodle

commit 21dfaa01339a3fd65142c429dcf212c9e89f644b
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 15 Nov 2012 13:51:07 +0800
Tag:    v2.4.0-rc1

Merge branch 'wip-MDL-35770-master' of git://github.com/marinaglancy/moodle

commit f138b38705fbbdf5d967347069cf73847249bc59
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 15 Nov 2012 11:20:12 +0800
Tag:    v2.4.0-rc1

Merge branch 'w47_MDL-36524_m24_ieagain' of git://github.com/skodak/moodle

commit f315d159c86566ca12d9d4969de7fc632a91461a
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 15 Nov 2012 10:59:17 +0800
Tag:    v2.4.0-rc1

Merge branch 'wip-MDL-35770-master' of git://github.com/marinaglancy/moodle

commit e4a9cc642f129362a5526445000608d5e6b68dd4
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 15 Nov 2012 10:39:08 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36417-master' of git://github.com/FMCorz/moodle

commit 211f815719e4447a6a03eda10158cf6da4c58b04
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 15 Nov 2012 10:06:00 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36526-master' of git://github.com/ankitagarwal/moodle

commit 05c7471b5c540205c6f7f308bd5313e54662c7f9
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 15 Nov 2012 08:57:02 +0800
Tag:    v2.3.4

Merge branch 'wip-MDL-36576-m23' of git://github.com/amygroshek/moodle into MOODLE_23_STABLE

commit 532a704d955d2ccee39046faa6f0855b26365346
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 15 Nov 2012 08:56:43 +0800
Tag:    v2.4.0-rc1

Merge branch 'wip-MDL-36576-m24' of git://github.com/amygroshek/moodle

commit cbb0459962672de2c4c34974da94393531a333d1
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Nov 2012 14:29:48 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36561-master-int' of git://github.com/FMCorz/moodle

commit 43b87303818685cb74cd36ae9d83cd3b09237c16
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Nov 2012 14:26:06 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36449-master-int' of git://github.com/FMCorz/moodle

commit cc94106b71f52e592c35858d90854a13161d8773
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Nov 2012 14:16:30 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36565-master-int' of git://github.com/FMCorz/moodle

commit ebdbc6b7817ff3ca39fd69cb536995bea818a97a
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Nov 2012 14:10:49 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36323-master-int' of git://github.com/FMCorz/moodle

commit 1720550b5d32b6444940bdf871633d1580f4b700
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Nov 2012 12:22:54 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36575_modLtiGenerator' of git://github.com/moodlerooms/moodle

commit 7fc7a8b94cfe2954e65455ccf2836d5e2658eef3
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Nov 2012 11:32:52 +0800
Tag:    v2.4.0-rc1

Merge branch 'w46_MDL-36457_m24_jsmin' of git://github.com/skodak/moodle

commit f5c074b60af32e27e195295221031059a83f31d4
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Nov 2012 11:26:05 +0800
Tag:    v2.3.4

Merge branch 'w46_MDL-36283_m23_cohortmembers' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 8051e85a3f8f51bc9ab0459af57858f3b47ed7ef
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Nov 2012 11:25:54 +0800
Tag:    v2.4.0-rc1

Merge branch 'w46_MDL-36283_m24_cohortmembers' of git://github.com/skodak/moodle

commit ecf1f30591f08f18c1e95db7a199be5b4c948f5d
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Nov 2012 11:17:58 +0800
Tag:    v2.2.7

Merge branch 'MDL-35358_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit 89a55cd9e0a4306bcf488120455818b3d0862a9f
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Nov 2012 11:17:00 +0800
Tag:    v2.3.4

Merge branch 'MDL-35358_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit 124b3fcef759abe692b81dc4ea752aedc38ace47
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Nov 2012 11:16:47 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-35358' of git://github.com/rwijaya/moodle

commit 3484a698618ee8628129631b4fb9bb82400d6d55
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Nov 2012 10:45:19 +0800
Tag:    v2.4.0-rc1

Merge branch 'wip-MDL-36267-master' of git://github.com/marinaglancy/moodle

commit aab4251842cea85f4ce99cc6f28597af398417a6
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Nov 2012 10:34:03 +0800
Tag:    v2.2.7

Merge branch 'MDL-26660-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 83ee1d4a43dfcebcb11fab79d3f419da57cc2336
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Nov 2012 10:33:54 +0800
Tag:    v2.3.4

Merge branch 'MDL-26660-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 5ebe0ca37aacaf3eaf18f5766edbde87f4a8a2d6
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Nov 2012 10:33:45 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-26660-master' of git://github.com/FMCorz/moodle

commit 2d0d36f219550f146eef8270abf19ef3be4ec103
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Nov 2012 09:58:27 +0800
Tag:    v2.4.0-rc1

Merge branch 'wip-MDL-36048-master' of git://github.com/marinaglancy/moodle

commit e015e5da3445f552a482d48b0848adcb69cda2c9
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Nov 2012 09:56:23 +0800
Tag:    v2.2.7

Merge branch 'MDL-34520-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 40a639fa62757306d01f6f06877d185a46a93ed9
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Nov 2012 09:56:03 +0800
Tag:    v2.3.4

Merge branch 'MDL-34520-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit 81d779899633be61a437043dcec3921fab363a26
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Nov 2012 09:55:51 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-34520-master' of git://github.com/ankitagarwal/moodle

commit 762c6c4fee6bce1ac492c1a035d19e7253ac52d4
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Nov 2012 09:30:59 +0800
Tag:    v2.4.0-rc1

Merge branch 'master_MDL-36467' of git://github.com/danmarsden/moodle

commit f58c96f842137eba9ece5c42c46308ab0f5a5fe4
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Nov 2012 09:29:51 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36369' of git://github.com/timhunt/moodle

commit 6b158f58b620c44f04025e9fabba3dee57de56a7
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Nov 2012 09:18:43 +0800
Tag:    v2.2.7

Merge branch 'wip-MDL-36413-MOODLE_22_STABLE' of https://github.com/nicolasconnault/moodle into MOODLE_22_STABLE

commit b1a7fcf2b3ecb2b0d9d5b23ff8b25a589fad7157
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Nov 2012 09:18:33 +0800
Tag:    v2.3.4

Merge branch 'wip-MDL-36413-MOODLE_23_STABLE' of https://github.com/nicolasconnault/moodle into MOODLE_23_STABLE

commit 25c1b2edc404e61bca657ab145434b6b848cf57f
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Nov 2012 09:18:27 +0800
Tag:    v2.4.0-rc1

Merge branch 'wip-MDL-36413-master' of https://github.com/nicolasconnault/moodle

commit 59d332ea716ed71f9b83324bfb1e957346a8cf42
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Nov 2012 08:31:29 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36494-invalid-update-debugging' of git://github.com/mudrd8mz/moodle

commit af698e64d230c0f91d893924e7921d1600fbcd55
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Nov 2012 13:40:28 +0800
Tag:    v2.3.4

Merge branch 'w46_MDL-36169_m23_enrolsort' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 4f642679949da5e50075cf6a7007941bb880d130
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Nov 2012 13:40:18 +0800
Tag:    v2.4.0-rc1

Merge branch 'w46_MDL-36169_m24_enrolsort' of git://github.com/skodak/moodle

commit 3517201801dcab62e0ea56b0cdbbb9a4d51b5219
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Nov 2012 13:22:47 +0800
Tag:    v2.3.4

Merge branch 'MDL-30545_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit b0ba493cd08fc01bb6cd8af9957726a4b6ddacc7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Nov 2012 13:21:50 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-30545' of git://github.com/timhunt/moodle

commit 47e126569dac0f0e6e0763493e25008fbc24c8a3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Nov 2012 13:04:14 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36509' of git://github.com/netspotau/moodle-mod_assign

commit 0da9003a4566f624ff7c1fb8a4a896bb69327cbf
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Nov 2012 12:57:30 +0800
Tag:    v2.4.0-rc1

Merge branch 'wip-MDL-36398-master' of git://github.com/barbararamiro/moodle

commit 3c9b489820a83cbbad08d2939bb838adc7fdad64
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Nov 2012 11:04:23 +0800
Tag:    v2.4.0-rc1

Merge branch 'wip-MDL-35260-master' of git://github.com/marinaglancy/moodle

commit 05f2bdea31de56ebbb30a20ca29e51a630056dc6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Nov 2012 10:36:16 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-35422-workshop-submit-button' of git://github.com/mudrd8mz/moodle

commit 2d910d046432bd3abca4fc5fd9a7d656fdaf7630
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Nov 2012 10:30:36 +0800
Tag:    v2.4.0-rc1

Merge branch 'w46_MDL-36487_m24_ieheaders' of git://github.com/skodak/moodle

commit 62471f82562f2aca6c59ab39efa6224e9410c47e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Nov 2012 10:26:29 +0800
Tag:    v2.4.0-rc1

Merge branch 'wip-MDL-36111-m24' of git://github.com/samhemelryk/moodle

commit 9cb2b61621c485b3f7da290abec61b2a3110f71c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Nov 2012 10:17:34 +0800
Tag:    v2.4.0-rc1

Merge branch 'w46_MDL-36481_m24_intranetie' of git://github.com/skodak/moodle

commit 529af38e0e06c77d93bf5c7d3b327b713090a1c5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Nov 2012 10:10:30 +0800
Tag:    v2.4.0-rc1

Merge branch 'wip-MDL-36450-master' of git://github.com/barbararamiro/moodle

commit 176a06e4e683aa63a9506dc8853bf79a2d859119
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 09 Nov 2012 17:54:52 +0800
Tag:    v2.1.9

Merge branch 'install_21_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_21_STABLE

commit ab8c8a8f920839855058b2cdde7ff18bd4ac311b
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 09 Nov 2012 17:54:19 +0800
Tag:    v2.2.6

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit 53118fe1ea54433709f4aa6b53acee575bbe3156
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 09 Nov 2012 17:53:20 +0800
Tag:    v2.3.3

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit c00804c66a2b68515e8b87d9fc23d4f7a7adc1b4
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 09 Nov 2012 17:52:55 +0800
Tag:    v2.4.0-beta

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit d2dc4c45513914eb6c2c46263dfb63dea46541bf
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 09 Nov 2012 15:54:46 +0800
Tag:    v2.4.0-beta

Merge branch 'w45_MDL-36468_m24_tinymce' of git://github.com/skodak/moodle

commit 8ca0746296d9d87b9f94e67b213699b93a5ae027
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 09 Nov 2012 13:43:37 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-36324-m24' of git://github.com/samhemelryk/moodle

commit 224186339e0cd0836cfc92345acb6c629baeab14
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 09 Nov 2012 12:00:47 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34572_accessibility' of git://github.com/rwijaya/moodle

commit 2f1904f811bf6efe2187ec33ae3816e7831dcdbf
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 09 Nov 2012 10:30:55 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35238-deployment' of git://github.com/mudrd8mz/moodle

commit 235ec73c0f2f06253e8fb627740be7823fad5b31
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 08 Nov 2012 18:55:20 +0800
Tag:    v2.2.6

Merge branch 'MDL-35349_m22' of git://github.com/markn86/moodle into MOODLE_22_STABLE

commit b99ee21bfca9e3290e6133b6907523f3eefb568a
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 08 Nov 2012 18:55:10 +0800
Tag:    v2.3.3

Merge branch 'MDL-35349_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE

commit 440021c8a503c15f5d8797b58f6b5ed97ff2edb5
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 08 Nov 2012 18:54:58 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35349_master' of git://github.com/markn86/moodle

commit a56dc903208e1f50c2f85bf823fb4b94eef65d82
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 08 Nov 2012 18:10:26 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33766-master' of git://github.com/FMCorz/moodle

commit aa8739776cc1cdf2426b40eedaade9d86faca291
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 08 Nov 2012 15:15:54 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34572_accessibility' of git://github.com/rwijaya/moodle

commit bc7fdb42797c85c5dadab5cda8dcc6f67c10ffb0
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 08 Nov 2012 15:13:18 +0800
Tag:    v2.3.3

Merge branch 'w45_MDL-36196_m23_vercheck' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 967ec6fb4d3bbf4f31758e655b1add095a3e77b1
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 08 Nov 2012 15:13:10 +0800
Tag:    v2.4.0-beta

Merge branch 'w45_MDL-36196_m24_vercheck' of git://github.com/skodak/moodle

commit 282183647bdb9db096539f5ca6d44dd8d2570bfd
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 08 Nov 2012 15:10:06 +0800
Tag:    v2.3.3

Merge branch 'MDL-36051_23' of git://github.com/rlorenzo/moodle into MOODLE_23_STABLE

commit aa289da8346cf2feadc6e19249abcd463778a710
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 08 Nov 2012 15:09:59 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-36051_24' of git://github.com/rlorenzo/moodle

commit 1b4d837a75522c3010eac967af7f5111692fec1d
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 08 Nov 2012 15:07:17 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35556c' of git://github.com/srynot4sale/moodle

commit 0d90b7e4bcd6562f41a35691373cf80984e47173
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 08 Nov 2012 15:04:19 +0800
Tag:    v2.4.0-beta

Merge branch 'w45_MDL-36431_m24_selfdefaults' of git://github.com/skodak/moodle

commit 42fd0b64b95b3ef9d1f91a1838574040fbf5d093
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 08 Nov 2012 14:53:06 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34270_master' of https://github.com/markn86/moodle

commit 62c2b3d818937b6b1fdd807f6adcf3dd6ddcde12
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 08 Nov 2012 11:08:17 +0800
Tag:    v2.2.6

Merge branch 'MDL-36422-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 6211ff4c126569e32004a48ffca8203570cec0ea
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 08 Nov 2012 11:08:06 +0800
Tag:    v2.3.3

Merge branch 'MDL-36422-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit f7febae6d0215e1e182c26a32109683785db3c81
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 08 Nov 2012 11:07:43 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-36422-master' of git://github.com/FMCorz/moodle

commit 809c1bee49f917f812b65b9ec565e7971e27d627
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 08 Nov 2012 09:48:36 +0800
Tag:    v2.4.0-beta

Merge branch 'wip_master_mdl-36119_ldap_paged_results' of git://github.com/iarenaza/moodle

commit bec1b02a9169add54cbd24e000cee04356bde0c9
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 08 Nov 2012 09:33:43 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-36381-m24' of git://github.com/samhemelryk/moodle

commit 650e6c7339d7a1120d5fe097eaf35e37af8cff6e
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 08 Nov 2012 09:26:08 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-36290-master' of git://github.com/FMCorz/moodle

commit 7164d2f68ad7cea637920313788a1b12ab73e3f7
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 08 Nov 2012 08:52:25 +0800
Tag:    v2.4.0-beta

Merge branch 'w45_MDL-36194_m24_editoruninstall' of git://github.com/skodak/moodle

commit 48fb811b4cb61b0cfa5ec2350a6065b98724a69d
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 Nov 2012 16:56:19 +0800
Tag:    v2.3.3

Merge branch 'MDL-36092-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE

commit 2ac705c41dd16c2dc9e5beef96a9e20c00e334bd
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 Nov 2012 16:56:11 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-36092-master' of git://git.luns.net.uk/moodle

commit e87bdad9adeca944116f31212f0b0e40fab8d1f5
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 Nov 2012 16:49:35 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-36368_master' of git://github.com/lazydaisy/moodle

commit 4b5a6b1327a4e4b8a21fe4b1eb75d1e503bd0b6f
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 Nov 2012 16:41:53 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-36317-master' of git://github.com/marinaglancy/moodle

commit 63fc21b4e51a83b83944e96263da5a92948b2e92
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 Nov 2012 16:32:43 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-26349-workshop-grades-display' of git://github.com/mudrd8mz/moodle

commit 64f7d154db77190ee760bf81f8c85a978ef3560e
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 Nov 2012 15:40:06 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-36113-master' of git://github.com/abgreeve/moodle

commit defcb763fe44034d6aa425dabcc4b942603b145e
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 Nov 2012 15:30:38 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-36209-workshop-assess-while-evaluating' of git://github.com/mudrd8mz/moodle

commit 092977fb0b61ab273e5801e70fa498f3d8d835e3
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 Nov 2012 15:06:36 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-36112-master' of git://github.com/abgreeve/moodle

commit 20aea2ea0d6a50e3bad2661f082194e7f95cad20
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 Nov 2012 14:49:15 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-17444_localPluginBackupRestoreMaster' of https://github.com/moodlerooms/moodle

commit 53b6a75a99752a9639db27da76ef731125744400
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 Nov 2012 14:44:26 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-35279-master' of git://github.com/marinaglancy/moodle

commit 5c6d2b1480556d79a4aff3a7ae70a9eff6f59a72
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 Nov 2012 14:34:37 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-36369-master' of git://github.com/marinaglancy/moodle

commit 8f3020558d5fb8ece0ccc942dbdc6b8903cd055b
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 Nov 2012 14:17:11 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-33017-m24-r2' of git://github.com/samhemelryk/moodle

commit 1383b1f29af5ee7bb22e35ab9ea5ecfc69365012
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 Nov 2012 14:09:25 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-36365-master' of git://github.com/abgreeve/moodle

commit ac012a9b2c384ee268f61b61fa25a17cd69092a7
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 Nov 2012 13:42:32 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-36397-master' of git://github.com/barbararamiro/moodle

commit 20272a548c4c57161fca285fd358f613dbf31a63
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 Nov 2012 11:57:58 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-mdl-36303' of git://github.com/rajeshtaneja/moodle

commit e9641de10d0ab7ac20463536baac98cb99e6e145
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 Nov 2012 11:22:26 +0800
Tag:    v2.4.0-beta

Merge branch 'w43_MDL-35771_m24_zindex' of git://github.com/skodak/moodle

commit 7451baff70e276256e6e2c0d38e3351c6c0c021c
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 Nov 2012 11:12:45 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-35961-master' of git://github.com/abgreeve/moodle

commit e830d6f98e9a36f954e1eeccad3ce60b1240907f
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 Nov 2012 10:51:06 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-30921-m24' of git://github.com/samhemelryk/moodle

commit 1191881888bcfa5128c2e12722dbd3600e6b8ec0
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 Nov 2012 10:49:28 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-36120-m24' of git://github.com/samhemelryk/moodle

commit a8ccdd28e07d700331fb7581ec421df00250c8f9
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 Nov 2012 09:33:47 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-36386-m24' of git://github.com/samhemelryk/moodle

commit 546667e238c1789b71789eb5789038395307075a
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 Nov 2012 09:28:44 +0800
Tag:    v2.1.9

Merge branch 'MDL-36346_21' of git://github.com/pauln/moodle into MOODLE_21_STABLE

commit 025ca6f7d302696be9df02adc20c626313f6dfe9
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 Nov 2012 09:28:02 +0800
Tag:    v2.2.6

Merge branch 'MDL-36346_22' of git://github.com/pauln/moodle into MOODLE_22_STABLE

commit e4224a5ae13c427c31b7e6d40c241828bcfa9ec5
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 Nov 2012 09:27:53 +0800
Tag:    v2.3.3

Merge branch 'MDL-36346_23' of git://github.com/pauln/moodle into MOODLE_23_STABLE

commit 8cc13d417d652d801e4e5d542d58a8f0ab515871
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Nov 2012 17:11:21 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-36392-master-int' of git://github.com/FMCorz/moodle

commit ee02183dcee2d279c1236577077fbcb9dd1bc7d0
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Nov 2012 16:35:35 +0800
Tag:    v2.1.9

Merge branch 'MDL-36346_21' of git://github.com/pauln/moodle into MOODLE_21_STABLE

commit d46929e4e3dee6d624b9d744edeefd8cb726e81e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Nov 2012 16:21:18 +0800
Tag:    v2.2.6

Merge branch 'MDL-36346_22' of git://github.com/pauln/moodle into MOODLE_22_STABLE

commit cb2829dea3d7fc097fcab55572618079dc50c56c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Nov 2012 16:20:14 +0800
Tag:    v2.3.3

Merge branch 'MDL-36346_23' of git://github.com/pauln/moodle into MOODLE_23_STABLE

commit 02b800ad678cfe8a77d7b3450e889e80e2d61475
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Nov 2012 16:14:13 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34270_master' of https://github.com/markn86/moodle

commit 87b210d98fb7acdac8cc270d1d262cfb7e534031
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Nov 2012 16:03:40 +0800
Tag:    v2.4.0-beta

Merge branch 'w43_MDL-34915_m24_simpleyui' of git://github.com/skodak/moodle

commit 90a23f067ce7f5de17fbac217efe25d75dc1f3b8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Nov 2012 14:58:49 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-36277-master' of git://github.com/barbararamiro/moodle

commit a353088f2c5395eef79b62d67683d72f1680826a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Nov 2012 14:48:22 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-36342-master' of git://github.com/barbararamiro/moodle

commit 14c01766ec7b804bc4b8984b605acd88f007b787
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Nov 2012 14:27:59 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-36338-master' of git://github.com/barbararamiro/moodle

commit e6acc052fbbb0f9038195a130f537940fcd3635d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Nov 2012 12:32:41 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-36037' of git://github.com/netspotau/moodle-mod_assign

commit cdf9b0c86f811bf108c495c8f375e36527b8f795
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Nov 2012 11:59:24 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-36266-notification-subject' of git://github.com/mudrd8mz/moodle

commit 61d49846a126ca568b98c345dac380ad83c42922
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Nov 2012 11:26:45 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-34342-m24' of git://github.com/samhemelryk/moodle

commit 915fc9b96c1225b85d871b4aeac9f988d6aa80af
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Nov 2012 11:17:44 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35421-conclusion' of git://github.com/mudrd8mz/moodle

commit 653c89bcf3db62e9eac3b39109eb8292e33ffa75
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Nov 2012 10:32:47 +0800
Tag:    v2.4.0-beta

Merge branch 'w43_MDL-36199_m24_pluginsingletons' of git://github.com/skodak/moodle

commit 2c36da50bc18d7e2f941b03146daae2707a0f255
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Nov 2012 10:03:23 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-36362-m24' of git://github.com/samhemelryk/moodle

commit 70cb1b995bdbc85d1df904406f3b1d152ff112d1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Nov 2012 09:59:16 +0800
Tag:    v2.4.0-beta

Merge branch 'm24_MDL-36360_Missing_cachestore_file_config_get_configuration_array' of git://github.com/scara/moodle

commit 70a5dda65a4cec7934160a43e86cc6a0ad378bdb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Nov 2012 09:50:30 +0800
Tag:    v2.2.6

Merge branch 'wip-MDL-36379-m22' of git://github.com/samhemelryk/moodle into MOODLE_22_STABLE

commit 2dab9d1943bdfa322ccbcc4878f7e7bb606bcf89
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Nov 2012 09:50:23 +0800
Tag:    v2.3.3

Merge branch 'wip-MDL-36379-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE

commit 4798b9dd7950a5965c3c10b53099391ea0c43d91
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Nov 2012 09:47:56 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-36379-m24' of git://github.com/samhemelryk/moodle

commit 485ddbd611e68a18071367190a4e748011fd2f7d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Nov 2012 09:42:11 +0800
Tag:    v2.3.3

Merge branch 'MDL-36347_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit eb5fc2a7d5446567392ec667cac7e63c0a37f9f1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Nov 2012 09:41:56 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-36347' of git://github.com/timhunt/moodle

commit aafded3f42063174bc46ec5b920783b7a97ce701
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Nov 2012 09:36:08 +0800
Tag:    v2.3.3

Merge branch 'MDL-36023-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE

commit 980140e7cf6f0dd2bb44959ec9b32eaf8c0f947f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Nov 2012 09:35:31 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-36023-master' of git://git.luns.net.uk/moodle

commit 9cbc51937a14a0ae5af507f6b0e794ffdcbd3e3f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 05 Nov 2012 15:11:46 +0800
Tag:    v2.2.6

Merge branch 'wip-mdl-35766-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 1fc59b22ded953b1980427dfc2c7f5eb965ee0c6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 05 Nov 2012 15:04:25 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-35260-master' of git://github.com/marinaglancy/moodle

commit f041dc5ff7e3057bf68a7155ba00591c044a7d82
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 05 Nov 2012 14:08:28 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-35768-master' of git://github.com/marinaglancy/moodle

commit 940a1e8a17e5353c1d1f8f3d7733cac78312271c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 05 Nov 2012 14:05:48 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34270_master' of https://github.com/markn86/moodle

commit 3339623dc0449e8a789aa0b041d004b656eddceb
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 05 Nov 2012 13:25:26 +0800
Tag:    v2.2.6

Merge branch 'wip-MDL-34527-m22' of git://github.com/samhemelryk/moodle into MOODLE_22_STABLE

commit 44999a9ed22594afdf32db9d4babd224d68728bd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 05 Nov 2012 13:25:18 +0800
Tag:    v2.3.3

Merge branch 'wip-MDL-34527-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE

commit 2c333485c413ded6ca869f5490f3608041acbc89
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 05 Nov 2012 13:25:10 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-34527-m24' of git://github.com/samhemelryk/moodle

commit f7c197eddb8a2d2d45fd588a72a545c528526a2b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 05 Nov 2012 11:31:55 +0800
Tag:    v2.3.3

Merge branch 'WIP-MDL-36069-M23' of git://github.com/nadavkav/moodle into MOODLE_23_STABLE

commit b59e928b698927a105ccdafbbd79a72bf88135c3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 05 Nov 2012 11:31:46 +0800
Tag:    v2.4.0-beta

Merge branch 'WIP-MDL-36069-master' of git://github.com/nadavkav/moodle

commit e262ca4250c2a211626cbf81716ac3e5d129e8a2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 05 Nov 2012 11:12:49 +0800
Tag:    v2.2.6

Merge branch 'MDL-33621_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit 906ad7d27aa7144b744edad029e07835b844288b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 05 Nov 2012 11:12:41 +0800
Tag:    v2.3.3

Merge branch 'MDL-33621_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit 96846c2a9eb618c933f1ceb6e2c9b9c2ecdc0c6d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 05 Nov 2012 11:12:32 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33621' of git://github.com/rwijaya/moodle

commit df79fff95b3c93a47eb19bb2b4938fe6274ab8f4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 05 Nov 2012 10:58:59 +0800
Tag:    v2.3.3

Merge branch 'wip-mdl-35787-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit 770314dd3712d0ba921b1534cae607cdf2d7f1e4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 05 Nov 2012 10:58:46 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-mdl-35787' of git://github.com/rajeshtaneja/moodle

commit 0875c405fd146f5d016e0e6573eee76ad4dada01
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 02 Nov 2012 14:52:33 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34270_master' of https://github.com/markn86/moodle

commit 7837711783b422c53093728970d994138a278317
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 02 Nov 2012 12:07:26 +0800
Tag:    v2.1.9

Merge branch 'w42_MDL-35469_m21_geckover' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 3fd59e36744d584944f65f9742a850a4b1926f3b
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 02 Nov 2012 12:07:21 +0800
Tag:    v2.2.6

Merge branch 'w42_MDL-35469_m22_geckover' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 0d79d9656685818bd6b9365d4bb3ee6ec12e4d0b
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 02 Nov 2012 12:07:16 +0800
Tag:    v2.3.3

Merge branch 'w42_MDL-35469_m23_geckover' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 3bd6e74afd4929596bdd357ecde36ac80c151878
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 02 Nov 2012 12:07:11 +0800
Tag:    v2.4.0-beta

Merge branch 'w42_MDL-35469_m24_geckover' of git://github.com/skodak/moodle

commit e8a8691a10cc8fc3a235d266dc97596cdbf63fcd
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 01 Nov 2012 14:14:27 +0800
Tag:    v2.2.6

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit 87ea3f04df8cd2a9021168ebe7042cf0f72f2972
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 01 Nov 2012 14:13:50 +0800
Tag:    v2.3.3

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit fe74dad062f89904c204765903f10fbdb322b616
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 01 Nov 2012 14:12:49 +0800
Tag:    v2.4.0-beta

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit 35ce18a8b106ac585810818d870099fa5a08c896
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 01 Nov 2012 10:03:19 +0800
Tag:    v2.3.3

Merge branch 'MDL-36315_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE

commit 3b92a1109874d225a2821b7a2cd9a154e681ee69
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 01 Nov 2012 10:02:47 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-36315' of git://github.com/stronk7/moodle

commit 11b748f6628d12e2a5dfe3f7e9fb8db9dd18d98e
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 01 Nov 2012 09:56:46 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34910_fix' of git://github.com/dmonllao/moodle

commit 02017cb9f325897fa832b9079ae20d1eb3869f54
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 31 Oct 2012 13:42:31 +0800
Tag:    v2.2.6

Merge branch 'MDL-28235-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 881d1d8aed5facf1f3aeb635a615421a0ddbe382
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 31 Oct 2012 13:42:23 +0800
Tag:    v2.3.3

Merge branch 'MDL-28235-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit c9e835e69ba4f61f64c8cb5595646379becc1427
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 31 Oct 2012 13:42:14 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-28235-master' of git://github.com/FMCorz/moodle

commit 18da8c03e03ef68dc5622dc65492e60a40dc6a93
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 31 Oct 2012 11:59:34 +0800
Tag:    v2.2.6

Merge branch 'MDL-32712-22' of https://github.com/mackensen/moodle into MOODLE_22_STABLE

commit 9787d3a9b57024b9005d53238570007c703dfe0c
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 31 Oct 2012 10:51:03 +0800
Tag:    v2.2.6

Merge branch 'wip-mdl-29762-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 5aa4e27404ec3ae1e6b433d038467c0f70a86289
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 31 Oct 2012 10:50:53 +0800
Tag:    v2.3.3

Merge branch 'wip-mdl-29762-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit b89ec44032a4ff258be5c38b299b5508b124a39b
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 31 Oct 2012 10:50:44 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-mdl-29762' of git://github.com/rajeshtaneja/moodle

commit 8120a4fa7266cb6f07eee9b254941b0a08b8742c
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 31 Oct 2012 09:59:44 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-mdl-34777' of git://github.com/rajeshtaneja/moodle

commit 639a2868c3417a81afaaad1ec9beee7e5cb46349
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Oct 2012 16:20:39 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34332c' of git://github.com/srynot4sale/moodle

commit eedaf16e9ebf745b9cd1731b7bd206deb3a54943
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Oct 2012 16:12:56 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35386b' of git://github.com/srynot4sale/moodle

commit 81bfb046afb449fcdbce5d4e560452692ef4d81e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Oct 2012 16:05:43 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34965_master' of git://github.com/dmonllao/moodle

commit 0c918a1f5255ab320856bb565a21f52e9fdf3e97
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Oct 2012 14:18:13 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-16660-m24' of git://github.com/samhemelryk/moodle

commit d3cf8fdf5dce180aed83a22f2caa8256c474e1c1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Oct 2012 13:44:38 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-36094-m24' of git://github.com/samhemelryk/moodle

commit 279fe97bd2cdf1e319c17aa327fdfc7a0a5b75d4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Oct 2012 13:40:44 +0800
Tag:    v2.2.6

Merge branch 'wip-MDL-32326-m22' of git://github.com/samhemelryk/moodle into MOODLE_22_STABLE

commit 6f7eeb377571ee67ae763dcb43f8653e22034908
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Oct 2012 13:40:33 +0800
Tag:    v2.3.3

Merge branch 'wip-MDL-32326-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE

commit 90d71805f4522695754e3445d99717a1fea430ea
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Oct 2012 13:40:24 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-32326-m24' of git://github.com/samhemelryk/moodle

commit 709d68434135efbf6dccbf0f6a8e958a434f3bdb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Oct 2012 12:14:40 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-36064' of git://github.com/netspotau/moodle-mod_assign

commit 4c8582b8c0641eb5bcab46ec2e9eedc632584427
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Oct 2012 12:12:01 +0800
Tag:    v2.2.6

Merge branch 'wip-mdl-35489-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 59d01f93cdd119a4dcb8c23cea6467adbbde9a84
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Oct 2012 12:11:52 +0800
Tag:    v2.3.3

Merge branch 'wip-mdl-35489-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit ef96f58535a6c050c633b6f90d4c65b0839b318d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Oct 2012 12:11:44 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-mdl-35489' of git://github.com/rajeshtaneja/moodle

commit 0caa0c869b1e27ed8f74c08299ed18af6e7a8e5b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Oct 2012 11:58:34 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-4655-master' of git://github.com/FMCorz/moodle

commit c64d22325ebeff0d5f17cf4281cbc391742f2a2d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Oct 2012 10:19:26 +0800
Tag:    v2.3.3

Merge branch 'MDL-36015_23' of git://git.catalyst.net.nz/moodle-r2 into MOODLE_23_STABLE

commit 8586777168c413edadadb5cb2fa87f6f0a9d24aa
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Oct 2012 10:18:45 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-36015_m1' of git://git.catalyst.net.nz/moodle-r2

commit d258956c4a0dfb9bbee5ea37a3671b18ce3c0d07
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Oct 2012 10:00:31 +0800
Tag:    v2.2.6

Merge branch 'wip-mdl-35910-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 33abc6e17348b7cb4742b5f0e169891465e996b6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Oct 2012 10:00:21 +0800
Tag:    v2.3.3

Merge branch 'wip-mdl-35910-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit 752a3f14befed5754efd54b3914bef358498618d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Oct 2012 10:00:11 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-mdl-35910' of git://github.com/rajeshtaneja/moodle

commit e76cc8f4c06956fc478b3c2b5484b7808caa47d6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Oct 2012 09:37:03 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-36135-evaluators' of git://github.com/mudrd8mz/moodle

commit 8688c112b658685afeba39c6cc7f839ba65c73ee
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Oct 2012 15:36:07 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34910_master' of git://github.com/dmonllao/moodle

commit f767e4b0661807d17ae29e5aa368c046605c7ca3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Oct 2012 15:34:03 +0800
Tag:    v2.2.6

Merge branch 'm22_MDL-35215' of git://github.com/totara/moodle into MOODLE_22_STABLE

commit 6b0ada1e6eaa2b197a37a44d4ae48be80a0649c0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Oct 2012 15:33:53 +0800
Tag:    v2.3.3

Merge branch 'm23_MDL-35215' of git://github.com/totara/moodle into MOODLE_23_STABLE

commit 01412583bf4d27bdd71f09a6f588c3181b622c03
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Oct 2012 15:33:43 +0800
Tag:    v2.4.0-beta

Merge branch 'master_MDL-35215' of git://github.com/totara/moodle

commit c2ef0e49821a42c25bb8260de28c54128f3ada1b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Oct 2012 15:21:48 +0800
Tag:    v2.3.3

Merge branch 'MDL-34363_m23' of git://github.com/merrill-oakland/moodle into MOODLE_23_STABLE

commit 69c9669a58a46125a72eb3fd38c45c65c4202d5c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Oct 2012 15:21:39 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34363' of git://github.com/merrill-oakland/moodle

commit 35776aab75ba53a247d3f642545964c64a7ad603
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Oct 2012 14:59:57 +0800
Tag:    v2.3.3

Merge branch 'WIP-MDL-36033-M23' of git://github.com/nadavkav/moodle into MOODLE_23_STABLE

commit 506263cfeeb55f396dce92dbe02b9bc98af48dce
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Oct 2012 14:59:45 +0800
Tag:    v2.4.0-beta

Merge branch 'WIP-MDL-36033-master' of git://github.com/nadavkav/moodle

commit 9416bcf43d625f48f735bdd3741d77f84cb6362a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Oct 2012 14:57:24 +0800
Tag:    v2.3.3

Merge branch 'wip-MDL-36075_MOODLE_23_STABLE' of git://github.com/jason-platts/moodle into MOODLE_23_STABLE

commit 4de9b85c8338021dc01474d476af81f25f92d899
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Oct 2012 14:57:14 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-36075_MASTER' of git://github.com/jason-platts/moodle

commit 02309e2d50e5be04f5825cc545e8385c7cb2bca7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Oct 2012 14:53:43 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34354-master' of git://git.luns.net.uk/moodle

commit 737492f1a556e3b1d038b00029d545e25dbe0edd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Oct 2012 14:50:23 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-36099-master' of git://git.luns.net.uk/moodle

commit 864a95aab375e849a580d27542b18629fcc55b9c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Oct 2012 14:35:35 +0800
Tag:    v2.2.6

Merge branch 'MDL-35880-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 80311cabde9ea2753a3dc15de7955bf21fa9295e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Oct 2012 14:35:28 +0800
Tag:    v2.3.3

Merge branch 'MDL-35880-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit f6110392f16eb8ca81d4fb01816dcd8f4e44d07c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Oct 2012 14:35:21 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35880-master' of git://github.com/ankitagarwal/moodle

commit aed58a3da88eebea35ccad542d5ad7f0a41b77d3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Oct 2012 14:32:11 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35990-master' of git://github.com/FMCorz/moodle

commit 890988221ca8aba5d21e17224864431ce9ddc0c1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Oct 2012 14:03:57 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35117-master' of git://github.com/FMCorz/moodle

commit 2407b73f18c6549cac354b4dc7eefe3b43aacf3c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Oct 2012 13:55:25 +0800
Tag:    v2.2.6

Merge branch 'MDL-34837-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 418a22905c90b9c684754d2899db94799c2d0747
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Oct 2012 13:55:14 +0800
Tag:    v2.3.3

Merge branch 'MDL-34837-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 3dce356ac4455fb74b11f4b6cb0f5ddafce389ec
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Oct 2012 13:55:06 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34837-master' of git://github.com/FMCorz/moodle

commit 06b33f67b034b53ac3f412931b65d4c7a1ef5b1d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Oct 2012 13:49:47 +0800
Tag:    v2.4.0-beta

Merge branch 'w43_MDL-35843_m42_expiryself' of git://github.com/skodak/moodle

commit b01783f086fcaa59921eeba5dbf504577ca07bfa
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Oct 2012 13:48:44 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35964' of git://github.com/timhunt/moodle

commit 08f24a6686783c6b35abc2ebf21a46dca0d81ae2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Oct 2012 12:39:06 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-34343-m24' of git://github.com/samhemelryk/moodle

commit 3aa721e035c2319f5a015c69b2556dd1f3f672cc
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Oct 2012 12:18:01 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34399' of git://github.com/timhunt/moodle

commit 6954e441695dbdb9928b70553eed99be5753a302
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Oct 2012 12:11:51 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-36086-workshop' of git://github.com/mudrd8mz/moodle

commit 0e0ad4c9f9e4c253f2350652cc7a4b74fca85496
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Oct 2012 11:52:25 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-36052-m24' of git://github.com/samhemelryk/moodle

commit a9b489525a7a515c9b09a542de0e08be830ce483
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Oct 2012 11:48:55 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-36115-m24' of git://github.com/samhemelryk/moodle

commit ff203527e74be21c4d3e9b2d4bb7b93711b8d079
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Oct 2012 09:54:12 +0800
Tag:    v2.3.3

Merge branch 'MDL-35297_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE

commit 26baacf7d760a338119e4dfd80eee15924319684
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Oct 2012 09:50:20 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35297' of git://github.com/stronk7/moodle

commit 00f581ca283fc7e4a67a2d536c6925817d98f411
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Oct 2012 16:27:59 +0800
Tag:    v2.2.6

Merge branch 'wip-mdl-30691-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit ac2b4fb66a5d2672628f06f6bf002a6f550b804f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Oct 2012 16:27:51 +0800
Tag:    v2.3.3

Merge branch 'wip-mdl-30691-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit 4b3a647cfb2ee3a25c93c9098959291d767eaf57
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Oct 2012 16:27:37 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-mdl-30691' of git://github.com/rajeshtaneja/moodle

commit 9d53135aafefe27dd01bdb2514600536a289c6b1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Oct 2012 16:19:33 +0800
Tag:    v2.3.3

Merge branch 'MDL-34228-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE

commit 99da3344545c02214693525d0b99ef4c394d6ea8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Oct 2012 16:19:25 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34228-master' of git://github.com/sammarshallou/moodle

commit a407d10f1e99cd627ef2a27fb36b4fd2978bd1e4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Oct 2012 14:59:23 +0800
Tag:    v2.2.6

Merge branch 'wip-mdl-27309-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 48a8f1c7a0124594ff63950fb8de541e4d641828
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Oct 2012 14:59:15 +0800
Tag:    v2.3.3

Merge branch 'wip-mdl-27309-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit a2b86c741dde5e76afd7b8bbd82a4ab63ca52888
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Oct 2012 14:59:04 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-mdl-27309' of git://github.com/rajeshtaneja/moodle

commit ac088b1c210868fa7f20b33cc6823414313f2413
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Oct 2012 14:50:30 +0800
Tag:    v2.4.0-beta

Merge branch 'w42_MDL-35904_m24_mainadmin' of git://github.com/skodak/moodle

commit d44a43190abd7c249ed280418c52e5e64a39671c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Oct 2012 14:35:45 +0800
Tag:    v2.2.6

Merge branch 'wip-mdl-32218-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 760cab069590264f4d99993e3353b222f5072029
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Oct 2012 14:35:37 +0800
Tag:    v2.3.3

Merge branch 'wip-mdl-32218-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit ea0a092e996c0ad55348ca174bedf7e499af3e23
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Oct 2012 14:35:28 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-mdl-32218' of git://github.com/rajeshtaneja/moodle

commit d2936c2642cbc1d760c86e3ece72c175cc443158
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Oct 2012 13:47:46 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34367_message_lib' of git://github.com/andyjdavis/moodle

commit 9b0a3e17ba9d3e7f7e885107441c761cebc92c00
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Oct 2012 13:41:17 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-35769-master' of git://github.com/marinaglancy/moodle

commit cecd632a8a284b0f0ce744aa87dabdbd47f99e1c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Oct 2012 11:09:14 +0800
Tag:    v2.2.6

Merge branch 'MDL-33815_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit d50d615d7f806eea8cfc4d7da5f000377e270a03
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Oct 2012 11:09:06 +0800
Tag:    v2.3.3

Merge branch 'MDL-33815_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit fe09ba8785c14e2da224f714d71436018bddc1cd
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Oct 2012 11:08:58 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33815' of git://github.com/rwijaya/moodle

commit 63acd7f7ced53d0df3dd5cde76c5843c3c330b32
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Oct 2012 10:54:29 +0800
Tag:    v2.4.0-beta

Merge branch 'WIP-MDL-35563-master' of git://github.com/nadavkav/moodle

commit 43c7341b82991e450181de1f24f15a347f83a3a5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Oct 2012 10:48:23 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-32184-master' of http://github.com/phalacee/moodle

commit 991eb4f6d01768f7bfb3929666b8cb4604d2b972
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Oct 2012 10:46:58 +0800
Tag:    v2.2.6

Merge branch 'wip-MDL-32184-s22' of http://github.com/phalacee/moodle into MOODLE_22_STABLE

commit 6244126d6df5ffb897c1f067cda3e1852043ea0f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Oct 2012 10:46:49 +0800
Tag:    v2.3.3

Merge branch 'wip-MDL-32184-s23' of http://github.com/phalacee/moodle into MOODLE_23_STABLE

commit 0651778e95a3581a7d111bd3fa5f2fcd952347ce
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Oct 2012 10:41:24 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-32294-master' of git://github.com/FMCorz/moodle

commit 5def031e6fa6044267ba4a0d4d9e1df9c21a85a4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Oct 2012 10:37:52 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-32092' of git://github.com/rwijaya/moodle

commit 4e2c6207008ebedcce7e57d18e1d51d23a70f00a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Oct 2012 10:30:11 +0800
Tag:    v2.2.6

Merge branch 'MDL-21801_b_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit a83497790f34f16e8af332684e523405f3254db2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Oct 2012 10:30:00 +0800
Tag:    v2.3.3

Merge branch 'MDL-21801_b_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit 399fd6305299915e3ec2d953138ef837a0994bda
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Oct 2012 10:29:49 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-21801_b' of git://github.com/rwijaya/moodle

commit eed6cd198700e4aed5f2fd53ddb7ea28b2c7f0cb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Oct 2012 10:01:46 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35710' of git://github.com/netspotau/moodle-mod_assign

commit dab6b11914fb79fdb630efee1730ce0857c29227
Author: