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

commit e8e4d456209ea32b061fb79e0a798d4b13a7a287
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Mar 2015 22:46:37 +0800
Tag:    v2.7.6

Merge branch 'MDL-49335_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit 9db4890064b05dc543d0308a84818e6a4ad4efcc
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Mar 2015 22:46:34 +0800
Tag:    v2.8.4

Merge branch 'MDL-49335_28' of git://github.com/timhunt/moodle into MOODLE_28_STABLE

commit 1456b2674dec6f650c1d5dbf846695f0fbfa1b52
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Mar 2015 21:25:36 +0800
Tag:    v2.7.6

Merge branch 'MDL-49334_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit c6e925dbf0a4f071445a90dccd4a3af805427310
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Mar 2015 21:25:33 +0800
Tag:    v2.8.4

Merge branch 'MDL-49334_28' of git://github.com/timhunt/moodle into MOODLE_28_STABLE

commit fb53bebd1d03817a873a776136efc5910e10ef92
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Mar 2015 21:21:33 +0800
Tag:    v2.7.6

Merge branch 'MDL-47000-27' of git://github.com/merrill-oakland/moodle into MOODLE_27_STABLE

commit 35a615aa339714aecbb82039bd0b10c15f83994b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Mar 2015 21:21:30 +0800
Tag:    v2.8.4

Merge branch 'MDL-47000-28' of git://github.com/merrill-oakland/moodle into MOODLE_28_STABLE

commit 629df3afd0ef61dd45d35faafbfc595b3b8e41b3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Mar 2015 19:03:15 +0800
Tag:    v2.7.6

Merge branch 'MDL-34006_m27v7' of https://github.com/sbourget/moodle into MOODLE_27_STABLE

commit 84fd0fd52cc8bad89819e1b1a72c7b0ddac1cfc4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Mar 2015 19:03:12 +0800
Tag:    v2.8.4

Merge branch 'MDL-34006_m28v7' of https://github.com/sbourget/moodle into MOODLE_28_STABLE

commit e527aff4d251fc74ce0a917b9a1d7516e3a49708
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Mar 2015 16:34:50 +0800
Tag:    v2.8.4

Merge branch 'MDL-49160-28' of git://github.com/merrill-oakland/moodle into MOODLE_28_STABLE

commit da53b5500258b40591dde25dc91d5476fda20c52
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Mar 2015 01:27:18 +0800
Tag:    v2.7.6

Merge branch 'MOODLE_27_STABLE' of https://github.com/mitstek/moodle into MOODLE_27_STABLE

commit f479a30931488f5fa9bfa40ec2ed3748061854de
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Mar 2015 01:27:15 +0800
Tag:    v2.8.4

Merge branch 'MOODLE_28_STABLE' of https://github.com/mitstek/moodle into MOODLE_28_STABLE

commit 67957f5683affba269ba54760e0858689e8c0f5e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Mar 2015 00:57:56 +0800
Tag:    v2.7.6

Merge branch '27_MDL-49303' of https://github.com/danmarsden/moodle into MOODLE_27_STABLE

commit a62cc33c1f168ce0a3efc46455a7d9bb41858844
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Mar 2015 00:57:54 +0800
Tag:    v2.8.4

Merge branch '28_MDL-49303' of https://github.com/danmarsden/moodle into MOODLE_28_STABLE

commit 0dedf765e0b2e907d774dde99b37fd5fbca47493
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Mar 2015 19:06:19 +0800
Tag:    v2.8.4

Merge branch 'MDL-47911-28' of git://github.com/damyon/moodle into MOODLE_28_STABLE

commit 952bc6c5a6a32ec68f7920fbb9e12822580dd2cf
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Mar 2015 17:34:57 +0800
Tag:    v2.8.4

Merge branch 'MDL-23273-28' of git://github.com/zbdd/moodle into MOODLE_28_STABLE

commit 1bf41ebcd85911d898b46d52fd4336565ff65bbe
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Mar 2015 17:33:59 +0800
Tag:    v2.7.6

Merge branch 'MDL-23273-27' of git://github.com/zbdd/moodle into MOODLE_27_STABLE

commit 6fe7343a943b8ba94a268b7ffc5744131c4985fe
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 25 Feb 2015 22:57:36 +0800
Tag:    v2.8.4

Merge branch 'install_28_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_28_STABLE

commit ff6092696c2b2a3044356b4f66ac96ad925b1836
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 25 Feb 2015 22:57:32 +0800
Tag:    v2.7.6

Merge branch 'install_27_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_27_STABLE

commit a9558a0559b5368b440540b732de7e83bbdea905
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 25 Feb 2015 00:53:56 +0800
Tag:    v2.7.6

Merge branch 'MDL-49241-27-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_27_STABLE

commit 84be895b9406d894c128e2eda39d8609abcea4ea
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 25 Feb 2015 00:50:15 +0800
Tag:    v2.8.4

Merge branch 'MDL-49241-28-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_28_STABLE

commit e2abf6048c2a5e79d474f7435c686b6b35475180
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 24 Feb 2015 18:43:36 +0800
Tag:    v2.7.6

Merge branch 'wip_MDL-49184_m27_choice' of https://github.com/skodak/moodle into MOODLE_27_STABLE

commit 8732862bb589fb54fd2a71b837543b27f1a00875
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 24 Feb 2015 18:43:32 +0800
Tag:    v2.8.4

Merge branch 'wip_MDL-49184_m28_choice' of https://github.com/skodak/moodle into MOODLE_28_STABLE

commit 0aadd59a874d52b5e7d78c5e34a61e27a80ed5dd
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 24 Feb 2015 16:31:57 +0800
Tag:    v2.7.6

Merge branch 'MDL-49216-27' of git://github.com/andrewnicols/moodle into MOODLE_27_STABLE

commit 40b53bda8c4567fb1462f89fe0c64a30895483b5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 24 Feb 2015 16:31:54 +0800
Tag:    v2.8.4

Merge branch 'MDL-49216-28' of git://github.com/andrewnicols/moodle into MOODLE_28_STABLE

commit 8bcfbda51129479931245c64c6717cfdb077a3e2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 24 Feb 2015 00:29:27 +0800
Tag:    v2.7.6

Merge branch 'MDL-49198_m27' of https://github.com/markn86/moodle into MOODLE_27_STABLE

commit 105e1af0101544239a781abb261a9520b4a9170b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 24 Feb 2015 00:29:25 +0800
Tag:    v2.8.4

Merge branch 'MDL-49198_m28' of https://github.com/markn86/moodle into MOODLE_28_STABLE

commit 06b5e1f1e1b9b7843e2b8f6991ea33a0a4d986b3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 24 Feb 2015 00:21:33 +0800
Tag:    v2.8.4

Merge branch 'MDL-49200_m28' of https://github.com/markn86/moodle into MOODLE_28_STABLE

commit a06527d2804fb76511c779547fbe2ee48a4a893b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 24 Feb 2015 00:20:06 +0800
Tag:    v2.7.6

Merge branch 'MDL-49200_m27' of https://github.com/markn86/moodle into MOODLE_27_STABLE

commit d830e39f283febbbd953dbf3b931a53036aa4ecb
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Feb 2015 23:55:39 +0800
Tag:    v2.7.6

Merge branch 'MOODLE_27_STABLE' of https://github.com/eberhardt/moodle into MOODLE_27_STABLE

commit 9c2e581e82f9325ceb9ac3122c6b56f0003df7ee
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Feb 2015 23:55:37 +0800
Tag:    v2.8.4

Merge branch 'MOODLE_28_STABLE' of https://github.com/eberhardt/moodle into MOODLE_28_STABLE

commit d612b63001d0de5e8912f904f2e4fcb3f035fb4a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Feb 2015 17:18:00 +0800
Tag:    v2.7.6

Merge branch 'wip-mdl-49081-m27' of https://github.com/rajeshtaneja/moodle into MOODLE_27_STABLE

commit f4241a59742f7e1db9f6cdb1845ad46189828ceb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Feb 2015 17:17:58 +0800
Tag:    v2.8.4

Merge branch 'wip-mdl-49081-m28' of https://github.com/rajeshtaneja/moodle into MOODLE_28_STABLE

commit 00e8070f005d62c153beb154d2c116361aee3109
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Feb 2015 06:42:15 +0800
Tag:    v2.7.6

Merge branch 'MDL-48544-27' of git://github.com/andrewnicols/moodle into MOODLE_27_STABLE

commit fa75bb63e35b453f971058338abc7879b9dac685
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Feb 2015 06:42:14 +0800
Tag:    v2.8.4

Merge branch 'MDL-48544-28' of git://github.com/andrewnicols/moodle into MOODLE_28_STABLE

commit 4cd7c56432ec0aada1b75773581c4b2b3f2fc579
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Feb 2015 22:50:38 +0800
Tag:    v2.7.6

Merge branch 'wip-MDL-47558-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE

commit a1504fd7bce8d0595b6532be9f69bf4f69371bc5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Feb 2015 22:50:37 +0800
Tag:    v2.8.4

Merge branch 'wip-MDL-47558-m28' of git://github.com/marinaglancy/moodle into MOODLE_28_STABLE

commit 4f0874c0cfb10c1a98d228ece97ca07f5597d229
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Feb 2015 19:33:16 +0800
Tag:    v2.7.6

Merge branch 'MDL-44520-27' of git://github.com/xow/moodle into MOODLE_27_STABLE

commit 65610151658e024c56bab5564a05c83fc01307b7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Feb 2015 19:33:14 +0800
Tag:    v2.8.4

Merge branch 'MDL-44520-28' of git://github.com/xow/moodle into MOODLE_28_STABLE

commit 19e7fb0ca058ece46d67c3f3cc689f3c6605736f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Feb 2015 19:28:22 +0800
Tag:    v2.7.6

Merge branch 'MDL-48294-27' of git://github.com/jleyva/moodle into MOODLE_27_STABLE

commit 69d4a9b94f9d230f82317d56de4739318339cc3d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Feb 2015 19:28:21 +0800
Tag:    v2.8.4

Merge branch 'MDL-48294-28' of git://github.com/jleyva/moodle into MOODLE_28_STABLE

commit 62f5dc3fdcf23adb23a82d3cefd9fc3c6bb6e8e6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Feb 2015 18:29:20 +0800
Tag:    v2.7.6

Merge branch 'MDL_47085_27' of https://github.com/totara/openbadges into MOODLE_27_STABLE

commit de90103193193b3a73a8b7c044e14ca972381c80
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Feb 2015 18:29:19 +0800
Tag:    v2.8.4

Merge branch 'MDL_47085_28' of https://github.com/totara/openbadges into MOODLE_28_STABLE

commit b2792006aa9df8178af3141b22f06a83182f6348
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Feb 2015 18:21:44 +0800
Tag:    v2.7.6

Merge branch 'MDL-47953-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit e470238304e9a3735d6db540dd8c6a591e675454
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Feb 2015 18:21:42 +0800
Tag:    v2.8.4

Merge branch 'MDL-47953-28' of git://github.com/FMCorz/moodle into MOODLE_28_STABLE

commit 354e304f290c1efee7fee0c3f3690cfa37daabb1
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 05 Feb 2015 18:07:20 +0800
Tag:    v2.8.4

Merge branch 'install_28_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_28_STABLE

commit 40020334e3d8fa007dc8f56e6c90344c7524f3c9
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 05 Feb 2015 18:07:15 +0800
Tag:    v2.7.6

Merge branch 'install_27_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_27_STABLE

commit 6b6125b949aaa090a96cfc983dee77e48478299c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Feb 2015 23:55:25 +0800
Tag:    v2.7.6

Merge branch 'MDL-48942_survey_27' of https://github.com/andyjdavis/moodle into MOODLE_27_STABLE

commit 7606f81a88060a523a377ae2f7cada78f6b6543b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Feb 2015 23:55:24 +0800
Tag:    v2.8.4

Merge branch 'MDL-48942_survey_28' of https://github.com/andyjdavis/moodle into MOODLE_28_STABLE

commit 734df0d5670a5d64417d227dba2e77f0b992921c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Feb 2015 22:05:02 +0800
Tag:    v2.7.6

Merge branch 'MDL-48955-27' of https://github.com/vadimonus/moodle into MOODLE_27_STABLE

commit abb61b1a65afa312f050437185a89d59ed009f84
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Feb 2015 22:04:37 +0800
Tag:    v2.8.4

Merge branch 'MDL-48955-28' of https://github.com/vadimonus/moodle into MOODLE_28_STABLE

commit 14caa61bd4933133897cec661c250f5c7edb1869
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Feb 2015 21:16:53 +0800
Tag:    v2.8.4

Merge branch 'wip-mdl-49002-m28' of https://github.com/rajeshtaneja/moodle into MOODLE_28_STABLE

commit c14e5413474090a39725b5ff60f931c62360a381
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Feb 2015 21:15:20 +0800
Tag:    v2.7.6

Merge branch 'm27_MDL-48799_Incorrect_Legacy_Dir_Fallback' of https://github.com/scara/moodle into MOODLE_27_STABLE

commit 45acb77a3f178a5850ed2d71f23dafb9061baf7a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Feb 2015 21:13:25 +0800
Tag:    v2.8.4

Merge branch 'm28_MDL-48799_Incorrect_Legacy_Dir_Fallback' of https://github.com/scara/moodle into MOODLE_28_STABLE

commit a07b461a4ab4670f36451213c49c124ee1deeb4a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Feb 2015 20:56:45 +0800
Tag:    v2.7.6

Merge branch 'm27_MDL-48907' of https://github.com/totara/moodle into MOODLE_27_STABLE

commit 9e98e66cb23e9ecf4b0f8df081ba1d284bc685ba
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Feb 2015 20:56:44 +0800
Tag:    v2.8.4

Merge branch 'm28_MDL-48907' of https://github.com/totara/moodle into MOODLE_28_STABLE

commit 4a21f1b58be722f7f57026f92a505d3fafd54626
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Feb 2015 20:17:51 +0800
Tag:    v2.7.6

Merge branch 'MDL-44071-27' of git://github.com/zbdd/moodle into MOODLE_27_STABLE

commit 8bde10311899ca3842b32e10801dc95aca13252f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Feb 2015 20:17:20 +0800
Tag:    v2.8.4

Merge branch 'MDL-44071-28' of git://github.com/zbdd/moodle into MOODLE_28_STABLE

commit ae2faed37d81fac9b0478581a91873c44f164b36
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Feb 2015 19:13:51 +0800
Tag:    v2.7.6

Merge branch 'MDL-48533_m27' of https://github.com/markn86/moodle into MOODLE_27_STABLE

commit ed67b6fb061a30ff3a2ee304dcc76cc35e1ec789
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Feb 2015 19:13:50 +0800
Tag:    v2.8.4

Merge branch 'MDL-48533_m28' of https://github.com/markn86/moodle into MOODLE_28_STABLE

commit a84ea4944a74abd41af7453269abba30d63fc88c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Feb 2015 19:01:58 +0800
Tag:    v2.7.6

Merge branch 'wip-mdl-48624-m27' of https://github.com/rajeshtaneja/moodle into MOODLE_27_STABLE

commit 8bca20b7ecc4ade91cfc5b424cb9818f994b97b2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Feb 2015 19:01:57 +0800
Tag:    v2.8.4

Merge branch 'wip-mdl-48624-m28' of https://github.com/rajeshtaneja/moodle into MOODLE_28_STABLE

commit 0b331a73c6a96c702adce8910979e1133123e030
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 23 Jan 2015 01:53:23 +0800
Tag:    v2.8.3

Merge branch 'MDL-48949_28' of git://github.com/timhunt/moodle into MOODLE_28_STABLE

commit 3fdfc48a4440d51e0b10730dd3f6faa1ee920dbe
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Jan 2015 01:50:30 +0800
Tag:    v2.7.5

Merge branch 'MDL-48798-27' of https://github.com/vadimonus/moodle into MOODLE_27_STABLE

commit f11c6059eae6b76cdb4f259c8f55b956db92ace0
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Jan 2015 01:50:24 +0800
Tag:    v2.8.3

Merge branch 'MDL-48798-28' of https://github.com/vadimonus/moodle into MOODLE_28_STABLE

commit 2f0f15c2e79900ee5252b12f9b70d47d59239c54
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Jan 2015 01:30:50 +0800
Tag:    v2.8.3

Merge branch 'wip-mdl-48831-m28' of https://github.com/rajeshtaneja/moodle into MOODLE_28_STABLE

commit 29972512c105288fad2cd3c7560b675edb8741d7
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Jan 2015 01:21:14 +0800
Tag:    v2.7.5

Merge branch 'wip-mdl-48831-m27' of https://github.com/rajeshtaneja/moodle into MOODLE_27_STABLE

commit 68a5cc75a6450fe1a5b9fdf1531fd12b72445040
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Jan 2015 01:07:59 +0800
Tag:    v2.7.5

Merge branch 'MDL-48829_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit f40423c7665182325bbcf6d80313dd0fe548ad83
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Jan 2015 01:07:54 +0800
Tag:    v2.8.3

Merge branch 'MDL-48829_28' of git://github.com/timhunt/moodle into MOODLE_28_STABLE

commit 261cb39eca479d0a2d2f39d8ed2f6935ac5959f9
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Jan 2015 18:28:17 +0800
Tag:    v2.7.5

Merge branch 'MDL-14730_27' of git://github.com/jmvedrine/moodle into MOODLE_27_STABLE

commit c5203c98bf2180c9426e885985f25d045f4489da
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Jan 2015 18:27:46 +0800
Tag:    v2.8.3

Merge branch 'MDL-14730_28' of git://github.com/jmvedrine/moodle into MOODLE_28_STABLE

commit f88fc2bb8506343e2c10a74466be7337da0c9366
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Jan 2015 21:15:08 +0800
Tag:    v2.7.5

Merge branch 'MDL-36824_m27' of https://github.com/sbourget/moodle into MOODLE_27_STABLE

commit 601c8883c810eb29de3b77a6c619c4690843c81b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Jan 2015 21:15:06 +0800
Tag:    v2.8.3

Merge branch 'MDL-36824_m28' of https://github.com/sbourget/moodle into MOODLE_28_STABLE

commit f049403ed14503728cb6c51a74af6078c0fecd07
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Jan 2015 20:54:53 +0800
Tag:    v2.8.3

Merge branch 'MDL-39103-28' of git://github.com/xow/moodle into MOODLE_28_STABLE

commit 8ef170b1cc737e18bdd99fe58ca8c8415a4630fb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Jan 2015 20:54:32 +0800
Tag:    v2.7.5

Merge branch 'MDL-39103-27' of git://github.com/xow/moodle into MOODLE_27_STABLE

commit 953601bcb03fda1fb49de268b3030c435312a20d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Jan 2015 20:35:12 +0800
Tag:    v2.7.5

Merge branch 'MDL-45784-27' of git://github.com/xow/moodle into MOODLE_27_STABLE

commit 7e6be7ba1fdeb27fcaad85aa57cbb5c8f1354382
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Jan 2015 20:34:45 +0800
Tag:    v2.8.3

Merge branch 'MDL-45784-28' of git://github.com/xow/moodle into MOODLE_28_STABLE

commit 1d0a5a5be96dca5b49a0d7915121d3efa8fc02d2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Jan 2015 19:47:53 +0800
Tag:    v2.8.3

Merge branch 'MDL-48474_28' of git://github.com/timhunt/moodle into MOODLE_28_STABLE

commit 308bca3b39f127c52e54c11c3272bad81d15afc2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Jan 2015 19:45:39 +0800
Tag:    v2.7.5

Merge branch 'MDL-48474_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit d3e6254b401f588d48c8132f2f6d9985036a834d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Jan 2015 18:08:22 +0800
Tag:    v2.7.5

Merge branch 'MDL-40326_27' of git://github.com/jmvedrine/moodle into MOODLE_27_STABLE

commit 7f3932c840a3fd3578721892631a719384fbd7d6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Jan 2015 18:08:18 +0800
Tag:    v2.8.3

Merge branch 'MDL-40326_28' of git://github.com/jmvedrine/moodle into MOODLE_28_STABLE

commit 4ed7ae68a046a6a8eb894dc6c634aad6722ce65a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Jan 2015 16:29:11 +0800
Tag:    v2.8.3

Merge branch 'MDL-48510-28' of git://github.com/ankitagarwal/moodle into MOODLE_28_STABLE

commit ad028c1ea0c53ef4448286e7baee02bf656cdaf9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Jan 2015 22:37:54 +0800
Tag:    v2.7.5

Merge branch 'MDL-31774_27' of git://github.com/jmvedrine/moodle into MOODLE_27_STABLE

commit d9261783664005d1f20d402309a3d7a4f9fad4e5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Jan 2015 22:37:51 +0800
Tag:    v2.8.3

Merge branch 'MDL-31774_28' of git://github.com/jmvedrine/moodle into MOODLE_28_STABLE

commit 1cc4ac048628426f0ee2c7a26f6763b191eb6db3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Jan 2015 20:59:39 +0800
Tag:    v2.8.3

Merge branch 'MDL-47935-28' of git://github.com/gurgus/moodle into MOODLE_28_STABLE

commit e3d7ab13eda3a60a5780bd58a22ceb2041e1ed4a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Jan 2015 19:31:34 +0800
Tag:    v2.7.5

Merge branch 'MDL-44907-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit f7ae8d3b11fc60bff395b3731c66215465db1c9f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Jan 2015 19:30:32 +0800
Tag:    v2.8.3

Merge branch 'MDL-44907-28' of git://github.com/FMCorz/moodle into MOODLE_28_STABLE

commit 9c1f1cda90efa2966b0d750c50af04f7309e9108
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 08 Jan 2015 18:00:26 +0800
Tag:    v2.8.2

Merge branch 'install_28_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_28_STABLE

commit fb0cdc6b3c615264e1523d3c8fb2b146d7f235c6
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 08 Jan 2015 18:00:22 +0800
Tag:    v2.7.4

Merge branch 'install_27_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_27_STABLE

commit 7e025d62a074b6d7e34fabd1bcfd998a7c00477c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Jan 2015 20:21:05 +0800
Tag:    v2.7.4

Merge branch 'MDL-44393-27' of git://github.com/ankitagarwal/moodle into MOODLE_27_STABLE

commit 8b7e92206c9bd58097734135e6b4efccdb70019a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Jan 2015 20:21:04 +0800
Tag:    v2.8.2

Merge branch 'MDL-44393-28' of git://github.com/ankitagarwal/moodle into MOODLE_28_STABLE

commit 2a247d836301eb26ccc86760eb048cacb5c7fe2b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Jan 2015 20:04:10 +0800
Tag:    v2.7.4

Merge branch 'MDL-46015_27' of git://github.com/jmvedrine/moodle into MOODLE_27_STABLE

commit 787d05f3d38e9023808f15939ff9c50f098702f8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Jan 2015 20:04:09 +0800
Tag:    v2.8.2

Merge branch 'MDL-46015_28' of git://github.com/jmvedrine/moodle into MOODLE_28_STABLE

commit adfda6b19f147a77115e63f8826e18428fe1594f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Jan 2015 19:24:31 +0800
Tag:    v2.7.4

Merge branch 'MDL-48372-27' of git://github.com/ankitagarwal/moodle into MOODLE_27_STABLE

commit acb579245a9ea6f4e500d54b9cdb2c3e5f849421
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Jan 2015 19:24:30 +0800
Tag:    v2.8.2

Merge branch 'MDL-48372-28' of git://github.com/ankitagarwal/moodle into MOODLE_28_STABLE

commit d532fa77e33f9aa5d3ae0754f9ad5f526403c2db
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Jan 2015 19:19:39 +0800
Tag:    v2.7.4

Merge branch 'MDL-48442-27' of git://github.com/ankitagarwal/moodle into MOODLE_27_STABLE

commit f704c30f8a9a6fea2f82f9c0cf1f75aff9cfdcc2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Jan 2015 19:19:33 +0800
Tag:    v2.8.2

Merge branch 'MDL-48442-28' of git://github.com/ankitagarwal/moodle into MOODLE_28_STABLE

commit ec82925fb5f0dddde52f346ca3326ca867aa8947
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Jan 2015 19:11:47 +0800
Tag:    v2.7.4

Merge branch 'MDL-48534_m27' of https://github.com/markn86/moodle into MOODLE_27_STABLE

commit e54fe38e2b798ef73c7e9d71c9b7566eeb175035
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Jan 2015 19:11:43 +0800
Tag:    v2.8.2

Merge branch 'MDL-48534_m28' of https://github.com/markn86/moodle into MOODLE_28_STABLE

commit b21d1db3c3b2ac9a48a01bc65d25718fa65fea93
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Jan 2015 19:09:44 +0800
Tag:    v2.7.4

Merge branch 'MDL-48655-27' of git://github.com/merrill-oakland/moodle into MOODLE_27_STABLE

commit 921e63c880fee5fdce188b177bfc3813014e16f6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Jan 2015 19:09:43 +0800
Tag:    v2.8.2

Merge branch 'MDL-48655-28' of git://github.com/merrill-oakland/moodle into MOODLE_28_STABLE

commit 8e293f17cf793c4a472f31641727cd29f7c9bed5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Jan 2015 02:30:25 +0800
Tag:    v2.8.2

Merge branch 'MDL-48441_profile_guest_28' of https://github.com/andyjdavis/moodle into MOODLE_28_STABLE

commit c33c15f3cc7ae417b54041bb3c011fc70d746445
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Jan 2015 02:30:21 +0800
Tag:    v2.7.4

Merge branch 'MDL-48441_profile_guest_27' of https://github.com/andyjdavis/moodle into MOODLE_27_STABLE

commit bf4dcc4518f2beab5d67f3ff8127b3d75b6fe286
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Jan 2015 01:48:41 +0800
Tag:    v2.7.4

Merge branch 'MDL-46498_m27' of https://github.com/markn86/moodle into MOODLE_27_STABLE

commit 4afd408b555244c46c79245effdde5b1e1235b0b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Jan 2015 01:48:39 +0800
Tag:    v2.8.2

Merge branch 'MDL-46498_m28' of https://github.com/markn86/moodle into MOODLE_28_STABLE

commit 69d0012088f7a92a554e84e6428faf8e5adf79f0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 05 Jan 2015 23:49:28 +0800
Tag:    v2.7.4

Merge branch 'MDL-43679-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit 0aee829cd302b1db069900c599759f9b634c9117
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 05 Jan 2015 23:49:26 +0800
Tag:    v2.8.2

Merge branch 'MDL-43679-28' of git://github.com/FMCorz/moodle into MOODLE_28_STABLE

commit a5e8cb4aea0d4d2f0b623d2c51e8d84b2b9e1986
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 24 Dec 2014 21:22:26 +0800
Tag:    v2.8.2

Merge branch 'install_28_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_28_STABLE

commit 31f819b2725138684b423a8e24165224349886a9
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 24 Dec 2014 21:22:23 +0800
Tag:    v2.7.4

Merge branch 'install_27_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_27_STABLE

commit 1dca0feabd13a4352fb04dd4c26c9334f867c47f
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 24 Dec 2014 00:13:37 +0800
Tag:    v2.7.4

Merge branch 'MDL-48213-m27-master' of https://github.com/dthies/moodle into MOODLE_27_STABLE

commit 7783fcd76f348bb43e6152cd9021914e3a3ae50b
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 24 Dec 2014 00:13:14 +0800
Tag:    v2.8.2

Merge branch 'MDL-48213-m28-master' of https://github.com/dthies/moodle into MOODLE_28_STABLE

commit d1da63854080ac78b13b9c221e327f04dd4139c2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Dec 2014 01:01:11 +0800
Tag:    v2.7.4

Merge branch 'MDL27-48421' of https://github.com/timpricecatalyst/moodle into MOODLE_27_STABLE

commit 05ea4e002d2c8eab4e8988143d0b9d953b9d0c88
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Dec 2014 01:01:06 +0800
Tag:    v2.8.2

Merge branch 'MDL28-48421' of https://github.com/timpricecatalyst/moodle into MOODLE_28_STABLE

commit 060cec73916c61a00096a3d341d26e30219f9cc3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Dec 2014 23:28:57 +0800
Tag:    v2.7.4

Merge branch 'MDL-48638-27' of git://github.com/merrill-oakland/moodle into MOODLE_27_STABLE

commit bf671547abcd490c13a146e14d1bef0e120af91b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Dec 2014 23:25:35 +0800
Tag:    v2.8.2

Merge branch 'MDL-48638-28' of git://github.com/merrill-oakland/moodle into MOODLE_28_STABLE

commit 1b78a209a07119d611029ab233d3be3c597fabc2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Dec 2014 23:22:33 +0800
Tag:    v2.8.2

Merge branch 'MDL-48643-28' of git://github.com/merrill-oakland/moodle into MOODLE_28_STABLE

commit 9b27f063c847b610d776b65c954bb810a44228de
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Dec 2014 22:36:42 +0800
Tag:    v2.8.2

Merge branch 'MDL-48062-m28-master' of https://github.com/dthies/moodle into MOODLE_28_STABLE

commit c8f22b65e7db901188700dc7dda046a205fb3fa5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Dec 2014 22:34:57 +0800
Tag:    v2.7.4

Merge branch 'MDL-48062-m27-master' of https://github.com/dthies/moodle into MOODLE_27_STABLE

commit 9549cd267e18efa6e553f296f7f5e017c009934a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Dec 2014 22:04:29 +0800
Tag:    v2.7.4

Merge branch 'MDL-48224-27' of git://github.com/xow/moodle into MOODLE_27_STABLE

commit 61040870bbb99ab888775735180c6a4dfb4e7f3a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Dec 2014 22:04:23 +0800
Tag:    v2.8.2

Merge branch 'MDL-48224-28' of git://github.com/xow/moodle into MOODLE_28_STABLE

commit 8bdafc9460334abe1398f1cf1e364a2680c7a4da
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Dec 2014 21:52:44 +0800
Tag:    v2.7.4

Merge branch 'MDL-48534_m27' of https://github.com/markn86/moodle into MOODLE_27_STABLE

commit 7c4b6a84dd436e7df501c5ee8eefb91490dd76be
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Dec 2014 21:52:41 +0800
Tag:    v2.8.2

Merge branch 'MDL-48534_m28' of https://github.com/markn86/moodle into MOODLE_28_STABLE

commit dc94f80ec7ef67c571c9a597e1ad123d5869e3d2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Dec 2014 21:44:33 +0800
Tag:    v2.7.4

Merge branch 'm27_MDL-48483' of https://github.com/totara/moodle into MOODLE_27_STABLE

commit 03d3dfbfc5d892b844b57ef3ad1b812907e22904
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Dec 2014 21:44:29 +0800
Tag:    v2.8.2

Merge branch 'm28_MDL-48483' of https://github.com/totara/moodle into MOODLE_28_STABLE

commit 2e83315defc56eb8cd3fc03ff75abfa4c1a0ec91
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Dec 2014 21:41:15 +0800
Tag:    v2.7.4

Merge branch 'MDL-48580-27' of git://github.com/lameze/moodle into MOODLE_27_STABLE

commit cf447b8c0f8ea75dd374dd2a82fb7d5859196b63
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Dec 2014 21:41:13 +0800
Tag:    v2.8.2

Merge branch 'MDL-48580-28' of git://github.com/lameze/moodle into MOODLE_28_STABLE

commit a6af290ea4ee71f3f6ed27caa80a3c96d0068a8b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Dec 2014 21:38:06 +0800
Tag:    v2.8.2

Merge branch 'MDL-48591_m28' of https://github.com/jrchamp/moodle into MOODLE_28_STABLE

commit 1d8e6ecebebd36f068b5d26a794806c3f7bc932e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Dec 2014 21:38:04 +0800
Tag:    v2.7.4

Merge branch 'MDL-48591_m27' of https://github.com/jrchamp/moodle into MOODLE_27_STABLE

commit a163de2fa87a39bf185c85d213437c9c521c2e0b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Dec 2014 21:10:48 +0800
Tag:    v2.7.4

Merge branch 'MDL-48653_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit a4b06536fbe786e04c9cadffca3d2e18d6a04b59
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Dec 2014 21:10:46 +0800
Tag:    v2.8.2

Merge branch 'MDL-48653_28' of git://github.com/timhunt/moodle into MOODLE_28_STABLE

commit 9752358c503431cd4e5548b18ca43294d61eb4fd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Dec 2014 21:07:48 +0800
Tag:    v2.7.4

Merge branch 'MDL-48088-27' of git://github.com/jethac/moodle into MOODLE_27_STABLE

commit 6303e895e402245220bed29a4c3c195c4d2b2b61
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Dec 2014 21:07:46 +0800
Tag:    v2.8.2

Merge branch 'MDL-48088-28' of git://github.com/jethac/moodle into MOODLE_28_STABLE

commit cd56eaff2e274e5fd6ff42e6b0b5e4f334afec6a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Dec 2014 20:10:22 +0800
Tag:    v2.7.4

Merge branch 'MDL-48666_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit db6bbcbc16a41833648d6d757e2e96d4a6dc7df2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Dec 2014 20:09:18 +0800
Tag:    v2.8.2

Merge branch 'MDL-48666_28' of git://github.com/timhunt/moodle into MOODLE_28_STABLE

commit 88d14741045af0edd61e3c42e21239fbd47378b0
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 18 Dec 2014 19:25:07 +0800
Tag:    v2.8.2

Merge branch 'install_28_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_28_STABLE

commit 91b95c872450e4f9e7f51fb96fe176ac15ba9298
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 18 Dec 2014 19:25:02 +0800
Tag:    v2.7.4

Merge branch 'install_27_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_27_STABLE

commit bc79a75d5073b8545539b0f92b9651d67b3d12e5
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 17 Dec 2014 18:11:44 +0800
Tag:    v2.7.4

Merge branch 'MDL-44829_MOODLE_27_STABLE' of git://github.com/BenKelada/moodle into MOODLE_27_STABLE

commit cf7167cbae995c9300b181c95fd1f66834428b95
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 17 Dec 2014 18:11:41 +0800
Tag:    v2.8.2

Merge branch 'MDL-44829_MOODLE_28_STABLE' of git://github.com/BenKelada/moodle into MOODLE_28_STABLE

commit 8ea9052ae250d5c517e1b9611cda6ad4126f394f
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 17 Dec 2014 03:20:25 +0800
Tag:    v2.7.4

Merge branch 'MDL-43462_landscape_pdf_27' of git://github.com/davosmith/moodle into MOODLE_27_STABLE

commit 535a794f90344bd70a699516476e043c41e10e32
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 17 Dec 2014 03:20:23 +0800
Tag:    v2.8.2

Merge branch 'MDL-43462_landscape_pdf_28' of git://github.com/davosmith/moodle into MOODLE_28_STABLE

commit 589d9bbeff9ff94f24e17e1f8893ecf66a0d0418
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 17 Dec 2014 03:18:09 +0800
Tag:    v2.7.4

Merge branch 'MDL-42501-27' of git://github.com/lameze/moodle into MOODLE_27_STABLE

commit fa59a794f694004b8ee6f0d5b436cb8a81e9012b
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 17 Dec 2014 03:18:03 +0800
Tag:    v2.8.2

Merge branch 'MDL-42501-28' of git://github.com/lameze/moodle into MOODLE_28_STABLE

commit 3502a07c88c8b71b2ecad8c407d146cd1973b90e
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 17 Dec 2014 01:05:08 +0800
Tag:    v2.7.4

Merge branch 'MDL-48587-27' of git://github.com/xow/moodle into MOODLE_27_STABLE

commit e42056413c58aa6465711eed8ec379b6b6daac3d
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 17 Dec 2014 01:05:04 +0800
Tag:    v2.8.2

Merge branch 'MDL-48587-28' of git://github.com/xow/moodle into MOODLE_28_STABLE

commit 534fae49b15c76a9b31fba35696dff2708d55f43
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Dec 2014 21:54:15 +0800
Tag:    v2.7.4

Merge branch 'MDL-46442-27' of git://github.com/zbdd/moodle into MOODLE_27_STABLE

commit f0066ff80ca8f15702365ae17cd30698334b5659
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Dec 2014 21:54:12 +0800
Tag:    v2.8.2

Merge branch 'MDL-46442-28' of git://github.com/zbdd/moodle into MOODLE_28_STABLE

commit 5ef5c6c1e23aed4d4c887b49505b06a43235cb54
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Dec 2014 21:00:02 +0800
Tag:    v2.8.2

Merge branch 'MDL-47610-28' of git://github.com/zbdd/moodle into MOODLE_28_STABLE

commit a95cd718f9402d1bebeaeab41f1f7c81a7104d32
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Dec 2014 19:58:47 +0800
Tag:    v2.8.2

Merge branch 'MDL-46651-MOODLE_28_STABLE-restore-course-completion-duplicate-key' of https://github.com/Trii/moodle into MOODLE_28_STABLE

commit b6d40f849a2a1703c356c958ac71fa869632f701
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Dec 2014 19:58:40 +0800
Tag:    v2.7.4

Merge branch 'MDL-46651-MOODLE_27_STABLE-restore-course-completion-duplicate-key' of https://github.com/Trii/moodle into MOODLE_27_STABLE

commit 4d769736934342ff65cbbeabec119b7e042173b0
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Dec 2014 00:10:20 +0800
Tag:    v2.7.4

Merge branch 'MDL-38128_27' of https://github.com/dmonllao/moodle into MOODLE_27_STABLE

commit 744dc6e64785e8112888840423b02d68d84edcc0
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Dec 2014 00:10:17 +0800
Tag:    v2.8.2

Merge branch 'MDL-38128_28' of https://github.com/dmonllao/moodle into MOODLE_28_STABLE

commit c363aaee5df5d89f26fa2bc105151e5d8c97ab23
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Dec 2014 22:59:39 +0800
Tag:    v2.7.4

Merge branch 'MDL-45324_27' of git://github.com/jonof/moodle into MOODLE_27_STABLE

commit 0e956b0452942863519aa3c0cbc3ad586c3e8e95
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Dec 2014 22:59:37 +0800
Tag:    v2.8.2

Merge branch 'MDL-45324_28' of git://github.com/jonof/moodle into MOODLE_28_STABLE

commit a53354abbb54781cca4b55a049bf3a90fb0c6d49
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Dec 2014 22:14:38 +0800
Tag:    v2.7.4

Merge branch 'MDL-47176_MOODLE_27_STABLE' of https://github.com/crazyserver/moodle into MOODLE_27_STABLE

commit 82dd025984c63a63c4ba91e74faa4c6d53e390bd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Dec 2014 22:14:24 +0800
Tag:    v2.8.2

Merge branch 'MDL-47176_MOODLE_28_STABLE' of https://github.com/crazyserver/moodle into MOODLE_28_STABLE

commit 3c17bf4186d1923564084ddc10bfcbfefd6c3936
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Dec 2014 22:04:23 +0800
Tag:    v2.7.4

Merge branch 'MDL-48570-27' of https://github.com/pjking07/moodle into MOODLE_27_STABLE

commit b2e9074f3c903337a837da28bdcda0cb063898aa
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Dec 2014 20:32:13 +0800
Tag:    v2.8.2

Merge branch 'MDL-48169-28' of git://github.com/jethac/moodle into MOODLE_28_STABLE

commit ef32f260664523a2edff157d2b0e9c90be7d59f7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Dec 2014 20:21:13 +0800
Tag:    v2.7.4

Merge branch 'MDL-47475-27' of git://github.com/andrewnicols/moodle into MOODLE_27_STABLE

commit 73ed5ce9fb6edcbfecda7764f1a82434b68d2eb0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Dec 2014 20:21:11 +0800
Tag:    v2.8.2

Merge branch 'MDL-47475-28' of git://github.com/andrewnicols/moodle into MOODLE_28_STABLE

commit 087fd134420c425cae8dc6daf5dfb0b34889ee09
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 11 Dec 2014 17:55:17 +0800
Tag:    v2.8.2

Merge branch 'install_28_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_28_STABLE

commit dd8d001a9e33a471326b17625eb36a1e4ef0b7c0
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 11 Dec 2014 17:55:12 +0800
Tag:    v2.7.4

Merge branch 'install_27_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_27_STABLE

commit 4920ba49ed8dfe1e2cd70949c0f7d5e9975fde1a
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 10 Dec 2014 20:31:35 +0800
Tag:    v2.7.4

Merge branch 'MDL-48410_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit 49ba5a31c9353a6e8463b02807c91866ea6e0d59
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 10 Dec 2014 06:30:04 +0800
Tag:    v2.7.4

Merge branch 'MDL-47323-enrol-plugin-backup-27_STABLE' of https://github.com/mpetrowi/moodle into MOODLE_27_STABLE

commit 80154bd033c4d9a0824e79134bc9e25643e35b07
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 10 Dec 2014 06:30:01 +0800
Tag:    v2.8.2

Merge branch 'MDL-47323-enrol-plugin-backup-28_STABLE' of https://github.com/mpetrowi/moodle into MOODLE_28_STABLE

commit a855438a96388c48acf39f0a1d6bb601ae57b92b
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 10 Dec 2014 05:22:21 +0800
Tag:    v2.7.4

Merge branch 'MDL-45430-27' of git://github.com/ankitagarwal/moodle into MOODLE_27_STABLE

commit fd37fba94bd09df298988e6705f6e93af72fc679
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 10 Dec 2014 05:22:18 +0800
Tag:    v2.8.2

Merge branch 'MDL-45430-28' of git://github.com/ankitagarwal/moodle into MOODLE_28_STABLE

commit e732d0d9ca5feb9472ed99c3d4e0953b10e9a888
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Dec 2014 20:34:20 +0800
Tag:    v2.8.2

Merge branch 'MDL-45679_28' of git://github.com/jmvedrine/moodle into MOODLE_28_STABLE

commit 779d592ce5c20783a71dfdc9ce872aa742583e74
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Dec 2014 20:34:16 +0800
Tag:    v2.7.4

Merge branch 'MDL-45679_27' of git://github.com/jmvedrine/moodle into MOODLE_27_STABLE

commit 28e38410c51727d963da4670cd19d8403367be09
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Dec 2014 18:53:38 +0800
Tag:    v2.8.2

Merge branch 'MDL-48394-28' of git://github.com/jethac/moodle into MOODLE_28_STABLE

commit 83d5e8af7f177ee36ea7681e7fd89beb3c258e87
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Dec 2014 18:38:24 +0800
Tag:    v2.7.4

Merge branch 'MDL-41846-27' of git://github.com/xow/moodle into MOODLE_27_STABLE

commit b16b0a61a4002412526fa8d874f89b1caca4859d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Dec 2014 18:35:10 +0800
Tag:    v2.8.2

Merge branch 'MDL-41846-28' of git://github.com/xow/moodle into MOODLE_28_STABLE

commit 5985ad804b609efb902811af49e33c63d0fdaf07
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Dec 2014 23:19:13 +0800
Tag:    v2.7.4

Merge branch 'MDL-48410_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit 5eb62533cd38bfead26e3b833890c938dd66d704
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Dec 2014 23:19:11 +0800
Tag:    v2.8.2

Merge branch 'MDL-48410_28' of git://github.com/timhunt/moodle into MOODLE_28_STABLE

commit caf50470f49316977f8029a6715e1953318d94b1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Dec 2014 23:15:43 +0800
Tag:    v2.7.4

Merge branch 'MDL-48373_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit 7e5947b986e9e0fbbc1629280da56e7f7ad3078e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Dec 2014 23:15:41 +0800
Tag:    v2.8.2

Merge branch 'MDL-48373_28' of git://github.com/timhunt/moodle into MOODLE_28_STABLE

commit c55f204f31dfc008b99db6e49112923c252670f6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Dec 2014 21:34:05 +0800
Tag:    v2.7.4

Merge branch 'MDL-47246_27' of git://github.com/dmonllao/moodle into MOODLE_27_STABLE

commit 4f2e496184278b2e2b320ce3b8f4935e68fb1928
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Dec 2014 21:34:03 +0800
Tag:    v2.8.2

Merge branch 'MDL-47246_28' of git://github.com/dmonllao/moodle into MOODLE_28_STABLE

commit 79dfb7a9a7553d731cad10a06017b7a7392f3abe
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Dec 2014 21:22:20 +0800
Tag:    v2.7.4

Merge branch 'MDL-14908-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit 793e74fef31e0bdc574488130048ff9d84e19b25
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Dec 2014 21:22:17 +0800
Tag:    v2.8.2

Merge branch 'MDL-14908-28' of git://github.com/FMCorz/moodle into MOODLE_28_STABLE

commit 90c4c87e20af40c07ccf45a32941c76f666fa361
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Dec 2014 18:41:35 +0800
Tag:    v2.7.4

Merge branch 'wip-mdl-48290-m27' of https://github.com/rajeshtaneja/moodle into MOODLE_27_STABLE

commit f304fd2e6c1b9509eb9ec794e4547f228aa075b2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Dec 2014 18:41:35 +0800
Tag:    v2.8.2

Merge branch 'wip-mdl-48290-m28' of https://github.com/rajeshtaneja/moodle into MOODLE_28_STABLE

commit a007dcd629c2d884473ae95278b29ccebe58c5c7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Dec 2014 15:50:07 +0800
Tag:    v2.7.4

Merge branch 'MDL-34627_27' of https://github.com/dmonllao/moodle into MOODLE_27_STABLE

commit c538b47443fea169765971f95b9486962021894f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Dec 2014 15:50:03 +0800
Tag:    v2.8.2

Merge branch 'MDL-34627_28' of https://github.com/dmonllao/moodle into MOODLE_28_STABLE

commit 2c31a2e3dbf19606f45464c6a9453616f8806912
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Dec 2014 01:09:28 +0800
Tag:    v2.7.4

Merge branch 'wip_MDL-48420_m27_lasttypo' of https://github.com/skodak/moodle into MOODLE_27_STABLE

commit 8f8ace5cdd787643991e33d69e5322db00c5bd1d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Dec 2014 01:09:23 +0800
Tag:    v2.8.2

Merge branch 'wip_MDL-48420_m28_lasttypo' of https://github.com/skodak/moodle into MOODLE_28_STABLE

commit 932fe5122c65f486de21a3b8a44462d29031ca1a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Dec 2014 00:31:17 +0800
Tag:    v2.7.4

Merge branch 'MDL-48342_27' of git://github.com/jmvedrine/moodle into MOODLE_27_STABLE

commit efc6ed5e342dafa103ecb7c85bb9e89755a3d101
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Dec 2014 00:31:15 +0800
Tag:    v2.8.2

Merge branch 'MDL-48342_28' of git://github.com/jmvedrine/moodle into MOODLE_28_STABLE

commit 2a2a593b1d18a8cd529cc903345a227fb5216f71
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 01 Dec 2014 23:46:41 +0800
Tag:    v2.7.4

Merge branch 'MDL-40241_27' of https://github.com/dmonllao/moodle into MOODLE_27_STABLE

commit 7a1b7e41d9965eff92ca795a8044a406525e8504
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 01 Dec 2014 23:46:39 +0800
Tag:    v2.8.2

Merge branch 'MDL-40241_28' of https://github.com/dmonllao/moodle into MOODLE_28_STABLE

commit bb2f54224c9c782f609275395830d0ecc8a399e1
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 28 Nov 2014 16:04:47 +0800
Tag:    v2.8.2

Merge branch 'install_28_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_28_STABLE

commit 3bcc3c0a474ff191f45643e539c8d056e852cd92
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 28 Nov 2014 16:04:42 +0800
Tag:    v2.7.4

Merge branch 'install_27_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_27_STABLE

commit 7cda7d47a23af78a77ef62d11596ff701710c60d
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 26 Nov 2014 17:23:16 +0800
Tag:    v2.7.4

Merge branch 'MDL-43127-27-fixup' of https://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit f603096c47d413ed57e597394c0c929662181104
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 26 Nov 2014 17:23:08 +0800
Tag:    v2.8.2

Merge branch 'MDL-43127-28-fixup' of https://github.com/FMCorz/moodle into MOODLE_28_STABLE

commit a76630d7002cfd8fe32be0967166ee86a878573e
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 26 Nov 2014 16:20:42 +0800
Tag:    v2.8.2

Merge branch 'MDL-48210-28-checker-caching' of git://github.com/mudrd8mz/moodle into MOODLE_28_STABLE

commit 8272ee15edef2e470e2faa40cfeded63ca48c8f6
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 26 Nov 2014 16:20:39 +0800
Tag:    v2.7.4

Merge branch 'MDL-48210-27-checker-caching' of git://github.com/mudrd8mz/moodle into MOODLE_27_STABLE

commit aac37e5afde4b2a926375b59d697342314005742
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 25 Nov 2014 21:18:20 +0800
Tag:    v2.7.4

Merge branch 'MDL-41155-27' of git://github.com/gurgus/moodle into MOODLE_27_STABLE

commit b0b7c2d808bb04c09a80071d1b9576979e9f79ca
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 25 Nov 2014 21:18:14 +0800
Tag:    v2.8.2

Merge branch 'MDL-41155-28' of git://github.com/gurgus/moodle into MOODLE_28_STABLE

commit d2989079137e9a2b3bb4a21b4564a191f3339be9
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 25 Nov 2014 19:21:23 +0800
Tag:    v2.7.4

Merge branch 'MDL-46416-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit 71d77883661be2ffc1f0424e22462372b762aaea
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 25 Nov 2014 19:21:21 +0800
Tag:    v2.8.2

Merge branch 'MDL-46416-28' of git://github.com/FMCorz/moodle into MOODLE_28_STABLE

commit 6ae2ce88020c6a78311f291b31ffc952cc3c6190
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 25 Nov 2014 19:18:54 +0800
Tag:    v2.7.4

Merge branch 'MDL-43127-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit d758f054b9137ebae3767300c67c517eabf04a61
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 25 Nov 2014 19:18:52 +0800
Tag:    v2.8.2

Merge branch 'MDL-43127-28' of git://github.com/FMCorz/moodle into MOODLE_28_STABLE

commit 04334d635f3c3edc4d9ce8641c77a4f01fecedde
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 25 Nov 2014 19:07:56 +0800
Tag:    v2.7.4

Merge branch 'MDL-38128_27' of https://github.com/dmonllao/moodle into MOODLE_27_STABLE

commit f67638b05fb2baf3994179fe472b8cf72e4e636a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 25 Nov 2014 19:07:53 +0800
Tag:    v2.8.2

Merge branch 'MDL-38128_28' of https://github.com/dmonllao/moodle into MOODLE_28_STABLE

commit 009ac9f0fb74e90a1c616928b443508d10fdf67e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 25 Nov 2014 01:30:28 +0800
Tag:    v2.7.4

Merge branch '47832-27-removed' of git://github.com/samhemelryk/moodle into MOODLE_27_STABLE

commit 5ff9df857e3a34aecd31214fd1d276e47daf701b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 25 Nov 2014 01:30:20 +0800
Tag:    v2.8.2

Merge branch '47832-28-removed' of git://github.com/samhemelryk/moodle into MOODLE_28_STABLE

commit fe893fd43e5475bfbda983b087f23f73d24a47b2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 25 Nov 2014 01:11:18 +0800
Tag:    v2.7.4

Merge branch 'MDL-45867-m27-master' of https://github.com/dthies/moodle into MOODLE_27_STABLE

commit c97952e6afe31c1f3d9897550ea903c25e08b0f1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 25 Nov 2014 01:11:15 +0800
Tag:    v2.8.2

Merge branch 'MDL-45867-m28-master' of https://github.com/dthies/moodle into MOODLE_28_STABLE

commit e7f3fb0d4298a26d6c2411035ba74fbf226ad82b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 25 Nov 2014 01:02:14 +0800
Tag:    v2.7.4

Merge branch 'MDL-47601_m27' of https://github.com/markn86/moodle into MOODLE_27_STABLE

commit a0542940c59d5a216497d7e6c943ca7ea169ab8e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 25 Nov 2014 00:29:37 +0800
Tag:    v2.7.4

Merge branch 'wip-MDL-48252-27' of git://github.com/abgreeve/moodle into MOODLE_27_STABLE

commit edfb84865ae758bc27ad0d333514dc729d98c0da
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 25 Nov 2014 00:29:27 +0800
Tag:    v2.8.2

Merge branch 'wip-MDL-48252-28' of git://github.com/abgreeve/moodle into MOODLE_28_STABLE

commit 774522ff7ed7f47dd1102d21213023dff501a64a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 24 Nov 2014 23:37:53 +0800
Tag:    v2.8.2

Merge branch 'MDL-48274-28' of git://github.com/andrewnicols/moodle into MOODLE_28_STABLE

commit 688b5dc16b5b63c08ce82353d0aa537c6c33b67f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 24 Nov 2014 19:57:15 +0800
Tag:    v2.7.4

Merge branch 'wip-mdl-48302-m27' of https://github.com/rajeshtaneja/moodle into MOODLE_27_STABLE

commit 3a9daf6f9a706136accdc92d86aed7baafd5921f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 24 Nov 2014 19:57:11 +0800
Tag:    v2.8.2

Merge branch 'wip-mdl-48302-m28' of https://github.com/rajeshtaneja/moodle into MOODLE_28_STABLE

commit 1913d60133b8b70e42c063832c2981d0e99538db
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 24 Nov 2014 19:53:55 +0800
Tag:    v2.8.2

Merge branch 'MDL-48180-28' of git://github.com/FMCorz/moodle into MOODLE_28_STABLE

commit 81c559d05ee519ff89a83c9d0e5d14cf984cf418
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 20 Nov 2014 16:38:24 +0800
Tag:    v2.8.2

Merge branch 'install_28_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_28_STABLE

commit a249452e3b7c077cb8be8218aba42a04d48a5961
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 20 Nov 2014 16:38:18 +0800
Tag:    v2.7.4

Merge branch 'install_27_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_27_STABLE

commit 14605dc0fdd2105a9a74bd588fbb7f8fe8c91d4d
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 19 Nov 2014 14:40:48 +0800
Tag:    v2.7.4

Merge branch 'wip-mdl-46865-m27' of https://github.com/rajeshtaneja/moodle into MOODLE_27_STABLE

commit 29a036aa597285ea49a1950fab0d5e9e8e11b983
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Nov 2014 20:07:10 +0800
Tag:    v2.8.2

Merge branch 'MDL-48146_28' of git://github.com/timhunt/moodle into MOODLE_28_STABLE

commit c2aac9f91c528ea5c32b1c5705e2451822c40f6a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Nov 2014 20:04:49 +0800
Tag:    v2.7.4

Merge branch 'MDL-48146_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit b6e289615f7e137606bfb24a4ce9d6cb0a68b45d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Nov 2014 19:52:09 +0800
Tag:    v2.6.7

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

commit b734d64a1ccbe7b865e44723a619ea39e5598ebc
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Nov 2014 18:04:28 +0800
Tag:    v2.7.4

Merge branch 'MDL-47700-27' of git://github.com/xow/moodle into MOODLE_27_STABLE

commit 504397d251ff9f330bb369ba5217f38db667aa5f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Nov 2014 00:48:30 +0800
Tag:    v2.7.4

Merge branch 'MDL-30619_m27' of https://github.com/markn86/moodle into MOODLE_27_STABLE

commit e44b4ab7461ced5d0b8416576715d7f4e677d270
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Nov 2014 00:42:47 +0800
Tag:    v2.7.4

Merge branch 'MDL-48199_M27' of git://github.com/lazydaisy/moodle into MOODLE_27_STABLE

commit 38d6b6eb17678474610d32e40e1640dfa4b02b52
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Nov 2014 00:42:44 +0800
Tag:    v2.8.2

Merge branch 'MDL-48199_M28' of git://github.com/lazydaisy/moodle into MOODLE_28_STABLE

commit fe53059c0424955544f797b1c9ec7e33e1c710b8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Nov 2014 23:41:52 +0800
Tag:    v2.7.4

Merge branch 'MDL-47648_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit 6dfc37accffb3395ab57bbe7b662cef1951d9a8e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Nov 2014 23:41:38 +0800
Tag:    v2.8.2

Merge branch 'MDL-47648_28' of git://github.com/timhunt/moodle into MOODLE_28_STABLE

commit 8e8429f318c89cffc1edfd2136932d60e0c52365
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Nov 2014 23:33:44 +0800
Tag:    v2.7.4

Merge branch 'wip-mdl-46865-m27' of https://github.com/rajeshtaneja/moodle into MOODLE_27_STABLE

commit 1f04068364d2443370609bbc06b66245b1981c62
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Nov 2014 23:20:19 +0800
Tag:    v2.7.4

Merge branch 'm27_MDL-48023_Theme_Setting_Files_Cacheable_By_Both_Browsers_And_Proxies' of https://github.com/scara/moodle into MOODLE_27_STABLE

commit 2d747884c6b0db641b1a80ab427ad447487f0b45
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Nov 2014 23:20:17 +0800
Tag:    v2.8.2

Merge branch 'm28_MDL-48023_Theme_Setting_Files_Cacheable_By_Both_Browsers_And_Proxies' of https://github.com/scara/moodle into MOODLE_28_STABLE

commit b0abfdeefa854feae835333ad06ec95ab6378fc9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Nov 2014 23:13:25 +0800
Tag:    v2.7.4

Merge branch 'MDL-48042_27' of git://github.com/ppichet/moodle into MOODLE_27_STABLE

commit af2c296364e543c2bff5c719c15473b94819dd68
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Nov 2014 23:13:19 +0800
Tag:    v2.8.2

Merge branch 'MDL-48042_28' of git://github.com/ppichet/moodle into MOODLE_28_STABLE

commit 3b8a8712334a2bbb476b91189f066362fd402f36
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Nov 2014 21:52:49 +0800
Tag:    v2.8.2

Merge branch 'MDL-42756_28' of git://github.com/aolley/moodle into MOODLE_28_STABLE

commit 07db3050e909f568e80559a570af880ae72ac318
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Nov 2014 21:52:45 +0800
Tag:    v2.7.4

Merge branch 'MDL-42756_27' of git://github.com/aolley/moodle into MOODLE_27_STABLE

commit 038e41c9186966644c4c6ec878c7ceaef8015ab9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Nov 2014 21:31:31 +0800
Tag:    v2.7.4

Merge branch 'wip-MDL-36240-27' of git://github.com/abgreeve/moodle into MOODLE_27_STABLE

commit 8725f5ba66b763ea52d7b41842f072157f561ea1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Nov 2014 21:17:41 +0800
Tag:    v2.7.4

Merge branch 'MDL-43987-27' of git://github.com/xow/moodle into MOODLE_27_STABLE

commit 0c0714ae3b336966234b661483e0910ad220c0ff
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Nov 2014 21:17:40 +0800
Tag:    v2.8.2

Merge branch 'MDL-43987-28' of git://github.com/xow/moodle into MOODLE_28_STABLE

commit cba7b87887155f2f57c4ada3a5aeb065dab200c4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Nov 2014 20:52:42 +0800
Tag:    v2.7.4

Merge branch 'MDL-46640-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit 4d7f88d55c634ac61cde34d3dcb9a8679af31c55
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Nov 2014 20:52:36 +0800
Tag:    v2.8.2

Merge branch 'MDL-46640-28' of git://github.com/FMCorz/moodle into MOODLE_28_STABLE

commit d5f6d962e2368823b162ba092d9f65f735f8c744
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Nov 2014 19:44:15 +0800
Tag:    v2.8.2

Merge branch 'MDL-48150-28' of git://github.com/andrewnicols/moodle into MOODLE_28_STABLE

commit 4fdf2871a9e64462b0136db0f57189c2d4774665
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 12 Nov 2014 03:12:18 +0800
Tag:    v2.7.4

Merge branch 'MDL-47502' of https://github.com/eugeneventer/moodle-fixes into MOODLE_27_STABLE

commit a876e6b182ea6e7ca00f29d223ea68941857b395
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 12 Nov 2014 03:05:47 +0800
Tag:    v2.7.4

Merge branch 'MDL-47975-27' of git://github.com/damyon/moodle into MOODLE_27_STABLE

commit 9e70547e2307c1e1b0583109a8b6865c176e522a
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 12 Nov 2014 02:59:58 +0800
Tag:    v2.7.4

Merge branch 'MDL-48093-m27' of https://github.com/sammarshallou/moodle into MOODLE_27_STABLE

commit 272ad5b57791f9db8ae74c6ac41430c529e9fd1a
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 12 Nov 2014 02:48:36 +0800
Tag:    v2.8.1

Merge branch 'MDL-48168_28' of git://github.com/timhunt/moodle into MOODLE_28_STABLE

commit e323635e1bb0d6c0b80af88bf500fcf31156a374
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 06 Nov 2014 17:14:48 +0800
Tag:    v2.8.0-rc2

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

commit 4c37593dcd26ccce14291ab1aee8de8509b16ed7
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 06 Nov 2014 16:58:27 +0800
Tag:    v2.8.0-rc2

Merge branch 'MDL-47980-master-fixup' of https://github.com/jethac/moodle

commit 4aeebe34b4b1389ac4a4f2228c2e006075647599
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 06 Nov 2014 16:53:55 +0800
Tag:    v2.8.0-rc2

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

commit 956798d317c4ea9afc3a4fb2c2895386546b6600
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 06 Nov 2014 00:26:29 +0800
Tag:    v2.6.6

Merge branch 'MDL-47466-MOODLE_26_STABLE' of https://github.com/tehanuyor/moodle into MOODLE_26_STABLE

commit a647d27ad7667971b4e526d506e7979705165316
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 06 Nov 2014 00:26:03 +0800
Tag:    v2.7.3

Merge branch 'MDL-47466-MOODLE_27_STABLE' of https://github.com/tehanuyor/moodle into MOODLE_27_STABLE

commit 62e965c9b8c6e7a0ec97a00bc39b93759b77a609
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 06 Nov 2014 00:24:14 +0800
Tag:    v2.8.0-rc2

Merge branch 'MDL-47466-master' of https://github.com/tehanuyor/moodle

commit c293eb004bc8a9d34ead52769b23b8c86110f936
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Nov 2014 22:27:12 +0800
Tag:    v2.8.0-rc2

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

commit 5a6c9f1cfbf4ae137227325f2ee6bcca9dc28e18
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Nov 2014 20:11:16 +0800
Tag:    v2.8.0-rc2

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

commit 35d236c1ea53bf8d852049ccfca132e2a0e24e47
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Nov 2014 20:05:58 +0800
Tag:    v2.8.0-rc2

Merge branch 'MDL-48047-master' of git://github.com/lameze/moodle

commit 90de57db268f989172d0ce2a65f3fcac8dbfc1a2
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Nov 2014 20:03:48 +0800
Tag:    v2.8.0-rc2

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

commit f3fd91918786c8e19cfb5843d8aec28af5c3d681
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Nov 2014 20:00:19 +0800
Tag:    v2.8.0-rc2

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

commit 7ea14bb81953008f67a9af5a1842dde670feed58
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Nov 2014 19:18:22 +0800
Tag:    v2.8.0-rc2

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

commit a0cba367bdf00adad4d1d504181236ee69766173
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Nov 2014 19:03:57 +0800
Tag:    v2.8.0-rc2

Merge branch 'MDL-47982-master' of git://github.com/gurgus/moodle

commit fb3e9ea25d02c56ea3c028702e0332c35ae4d2ee
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Nov 2014 18:15:41 +0800
Tag:    v2.8.0-rc2

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

commit f61619597b00326660b7bf626415b43bf46d1a5f
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Nov 2014 00:50:47 +0800
Tag:    v2.8.0-rc2

Merge branch 'MDL-47893-master' of git://github.com/zbdd/moodle

commit f820acf01e1344f156832ab8b3d4036950b6c9aa
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Nov 2014 00:30:17 +0800
Tag:    v2.8.0-rc2

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

commit 712b72c0f047bda6eb22bd78e03092a0970eb996
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Nov 2014 23:20:58 +0800
Tag:    v2.8.0-rc1

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

commit 971163afaa5581eb4c896adb2b1e76c4fecd9bf1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Nov 2014 23:03:51 +0800
Tag:    v2.8.0-rc1

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

commit a46b0575726221038289b4eba618300f2bf34e3a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Nov 2014 23:01:59 +0800
Tag:    v2.8.0-rc1

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

commit e3d86c322b3d64f5d08d6413096176fea9d2fad2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Nov 2014 21:55:31 +0800
Tag:    v2.8.0-rc1

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

commit 1a27142afeeff6611c8f0e4057f94ceca71e0918
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Nov 2014 20:28:33 +0800
Tag:    v2.8.0-rc1

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

commit 1de9b5072aa80567a7caa58f8889dfc9cc555044
Author: Dan Poltawski <dan@moodle.com>
Date:   Sat, 01 Nov 2014 00:48:30 +0800
Tag:    v2.8.0-rc1

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

commit b4eaafd74427489f7019fb22094abd2729034d1e
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 31 Oct 2014 21:14:59 +0800
Tag:    v2.8.0-rc1

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

commit fca969b9bb4d264956e9704c7b4dc054b492f481
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 31 Oct 2014 01:31:12 +0800
Tag:    v2.8.0-rc1

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

commit ebbf039d0748b1174f998e74d3cda27d3724b1b1
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 30 Oct 2014 23:39:46 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-47746-master' of git://github.com/zbdd/moodle

commit 665611454dbee1b09e2b98617211198deb1eaa18
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 30 Oct 2014 23:15:28 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-47896-master' of git://github.com/zbdd/moodle

commit fb9604d67c7392f01207be5a757d3acbdef7b054
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 30 Oct 2014 22:31:38 +0800
Tag:    v2.8.0-rc1

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

commit f976c8e468cc43fa30ab180907c81cb206fd29d1
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 30 Oct 2014 22:24:35 +0800
Tag:    v2.8.0-rc1

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

commit fe5c340197cba1a8ec663f00b8e9ac9e9905275f
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 30 Oct 2014 16:30:43 +0800
Tag:    v2.8.0-rc1

Merge branch 'wip-MDL-47919-master2' of https://github.com/marinaglancy/moodle

commit 5906d379dbf8162ad3c134acb146370b429a94c2
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 29 Oct 2014 22:20:26 +0800
Tag:    v2.7.3

Merge branch 'wip_MDL-40949_m27_pathsettings' of https://github.com/skodak/moodle into MOODLE_27_STABLE

commit 8699d48e7d1ed9f3ae2f4c885585b4f836d3ad52
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 29 Oct 2014 21:24:23 +0800
Tag:    v2.6.6

Merge branch 'wip_MDL-40949_m26_pathsettings' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 4f8267025025fc510336652ae19f13ad7dbccc8f
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 29 Oct 2014 21:04:46 +0800
Tag:    v2.8.0-rc1

Merge branch 'wip_MDL-40949_m28_pathsettings' of https://github.com/skodak/moodle

commit 5d5e545fc78b9e5d9fe26265675e11d1d5675430
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 29 Oct 2014 20:56:03 +0800
Tag:    v2.8.0-rc1

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

commit b373c3507129e09c961be011c82f0349981c41d6
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 29 Oct 2014 20:42:55 +0800
Tag:    v2.8.0-rc1

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

commit 0af29b0383b0c2c81439a378bee3542e2054894a
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 29 Oct 2014 19:18:15 +0800
Tag:    v2.8.0-rc1

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

commit 3f80a7edce4a9f085eafef58797512d35714105a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 28 Oct 2014 20:32:48 +0800
Tag:    v2.8.0-rc1

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

commit 25c57e8cc20f760b1c0b0752b5d7fc921792ab82
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 28 Oct 2014 20:32:18 +0800
Tag:    v2.7.3

Merge branch 'install_27_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_27_STABLE

commit de0df15ea7e721d0e9ade032272935427e633d6e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 28 Oct 2014 20:32:08 +0800
Tag:    v2.6.6

Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE

commit ac3d43b6ecefa0a4318628547bf0c30891cdb610
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 28 Oct 2014 20:25:27 +0800
Tag:    v2.8.0-rc1

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

commit 31d6d2ae41fe8d8b787152062fa1660047de5827
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 28 Oct 2014 19:40:27 +0800
Tag:    v2.8.0-rc1

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

commit b5780fbd184641d0ac5ad8f1fcb932b6d47c480a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 27 Oct 2014 22:51:04 +0800
Tag:    v2.8.0-rc1

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

commit 7c636855e293126854cda33eab4fd635d8c51a71
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 27 Oct 2014 16:01:33 +0800
Tag:    v2.8.0-rc1

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

commit 77733e6b89774a7a09d20d4e7c589eef07401452
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 27 Oct 2014 15:47:07 +0800
Tag:    v2.8.0-rc1

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

commit a1ac634692ff11eef695f31991b8965f0fd56240
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 27 Oct 2014 15:40:06 +0800
Tag:    v2.8.0-rc1

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

commit 42b6b3913632fb5410659fbe149dcb428e4b8aa2
Author: Dan Poltawski <dan@moodle.com>
Date:   Sat, 25 Oct 2014 00:10:56 +0800
Tag:    v2.8.0-rc1

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

commit 8d1c5eceb33aeb8bf15c9f150f88384186288ded
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 24 Oct 2014 23:40:06 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-47545-master' of git://github.com/jleyva/moodle

commit 8afccaf8466361689bc5db27c5240bc44d132a76
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 24 Oct 2014 22:37:31 +0800
Tag:    v2.7.3

Merge branch 'MDL-46712-27' of git://github.com/jethac/moodle into MOODLE_27_STABLE

commit 024077a38e563eaeb5ec42a2248f1cfaacafcf13
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 24 Oct 2014 22:37:27 +0800
Tag:    v2.6.6

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

commit cb1bc5eb6beac93c482b986daa7eba1671a6c592
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 24 Oct 2014 22:37:26 +0800
Tag:    v2.8.0-rc1

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

commit f6dbc2bb9c7d386c0fa248ddbab3187a9d42e220
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 24 Oct 2014 22:25:42 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-47782-master' of git://github.com/lameze/moodle

commit 16ca7c28ba91205cc7bb2c9b64ce79ad7417a416
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 24 Oct 2014 22:19:50 +0800
Tag:    v2.6.6

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

commit 3d86260c08f77d103139f2cb6424acc87603cb08
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 24 Oct 2014 22:19:49 +0800
Tag:    v2.7.3

Merge branch 'MDL-47780_m27' of https://github.com/markn86/moodle into MOODLE_27_STABLE

commit 22ef599c5d64260a5a0e86785ba603397a428843
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 24 Oct 2014 22:19:48 +0800
Tag:    v2.8.0-rc1

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

commit 2e014c035b63ae5a5ca6c90806251ca6677371c9
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 24 Oct 2014 22:18:35 +0800
Tag:    v2.6.6

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

commit a0088bb79b9a1282301ae5f993c8fd888b6ffb02
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 24 Oct 2014 22:18:33 +0800
Tag:    v2.7.3

Merge branch 'wip-MDL-47760-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE

commit 519fd3dd4c56b84bcb442d695d5edbf8652db3e0
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 24 Oct 2014 22:18:32 +0800
Tag:    v2.8.0-rc1

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

commit 85f6922b00f05ce75bf3fdb415ed55f6ed7fa759
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 24 Oct 2014 22:16:59 +0800
Tag:    v2.6.6

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

commit f393fbb08b92694ab86f1b8bca501ca9992cd177
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 24 Oct 2014 22:16:56 +0800
Tag:    v2.7.3

Merge branch '46518-27' of git://github.com/samhemelryk/moodle into MOODLE_27_STABLE

commit d6eff32be004e08feb7dcc0086497a0324f077fc
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 24 Oct 2014 22:16:55 +0800
Tag:    v2.8.0-rc1

Merge branch '46518-28' of git://github.com/samhemelryk/moodle

commit 0b03353433131cfed1f3c7ce4c504abe5313f559
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 24 Oct 2014 22:14:53 +0800
Tag:    v2.8.0-rc1

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

commit 73715b3aa83ec4047c60d6f3f38cfb0c2a5e2e84
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 24 Oct 2014 22:14:38 +0800
Tag:    v2.7.3

Merge branch 'MDL-47804_27' of git://github.com/aolley/moodle into MOODLE_27_STABLE

commit fc74e6573e80d19885933c4a4f2bb6a8a68b1329
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 24 Oct 2014 22:13:27 +0800
Tag:    v2.6.6

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

commit 61cd8bb3cdea2d9ddb185074d0a6b44a89f0b60b
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 24 Oct 2014 22:13:16 +0800
Tag:    v2.7.3

Merge branch '47608-27' of git://github.com/samhemelryk/moodle into MOODLE_27_STABLE

commit 7638a4366f3292cb5ed876017eb49a123979788b
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 24 Oct 2014 22:12:59 +0800
Tag:    v2.8.0-rc1

Merge branch '47608-28' of git://github.com/samhemelryk/moodle

commit 19089bc41601ca02e8153f2723611b6f2b58f64e
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 24 Oct 2014 22:09:55 +0800
Tag:    v2.7.3

Merge branch 'MDL-47397-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit 182870087efd0a63f806559935a235a9e28eb0ac
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 24 Oct 2014 22:09:50 +0800
Tag:    v2.6.6

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

commit e29ec5323896bec16b71e819dad588b8ce5f1e0a
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 24 Oct 2014 21:53:21 +0800
Tag:    v2.8.0-rc1

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

commit 6c6375e438604abae05ec691acab2bc98862fce5
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 24 Oct 2014 21:34:09 +0800
Tag:    v2.8.0-rc1

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

commit 7dc62ed3cb0b81b945568b60157ee3b30cd7b5c6
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 24 Oct 2014 21:30:44 +0800
Tag:    v2.8.0-rc1

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

commit 1429a25cd80e1e557518759ff9da557c92f1570b
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 24 Oct 2014 21:13:59 +0800
Tag:    v2.8.0-rc1

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

commit edfa06b103bd8ca047c0584ba2be705e5a73ee07
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 24 Oct 2014 18:15:10 +0800
Tag:    v2.7.3

Merge branch 'install_27_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_27_STABLE

commit 5acd7ad70f1b8148165180900fdc38a35c1ad064
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 24 Oct 2014 18:15:05 +0800
Tag:    v2.6.6

Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE

commit 0255780b9c0ff94dbeafc5aa4fc0bd582ee38351
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 24 Oct 2014 00:30:28 +0800
Tag:    v2.8.0-rc1

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

commit 89df18c73d65fa763521be2814f5b5161fc50a94
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 24 Oct 2014 00:30:28 +0800
Tag:    v2.8.0-rc1

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

commit a87c0ddd4681aa65abc401102e1293d46d2d35a9
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 24 Oct 2014 00:28:42 +0800
Tag:    v2.6.6

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

commit 3c795ec9cb426b599181bf310d2d278245758755
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 24 Oct 2014 00:28:40 +0800
Tag:    v2.7.3

Merge branch 'MDL-47815-27' of git://github.com/damyon/moodle into MOODLE_27_STABLE

commit a5f9fc6be34eb3352b455a2d1bb432e09684c657
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 24 Oct 2014 00:28:36 +0800
Tag:    v2.8.0-rc1

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

commit f01242a3b485cf4ddef0a37994a4e8ff81c341d2
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 24 Oct 2014 00:28:36 +0800
Tag:    v2.8.0-rc1

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

commit ad968a36d6238705863266ad217fd95b9005970b
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 23 Oct 2014 23:35:50 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-47847-master' of git://github.com/jleyva/moodle

commit a92008ed25b9a9de884e664c5d5570b1163bd814
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 23 Oct 2014 23:35:50 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-47847-master' of git://github.com/jleyva/moodle

commit e7b026846b987a6ee7ae42016d812a03f3f65900
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 23 Oct 2014 23:33:27 +0800
Tag:    v2.7.3

Merge branch '47684-27' of git://github.com/samhemelryk/moodle into MOODLE_27_STABLE

commit 59258b0433a3a470f5f374e09db081637562c637
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 23 Oct 2014 23:33:00 +0800
Tag:    v2.6.6

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

commit db2ba9f3350d1755eac206f653053a4b1fb32faa
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 23 Oct 2014 23:32:22 +0800
Tag:    v2.7.3

Merge branch '47752-27' of git://github.com/samhemelryk/moodle into MOODLE_27_STABLE

commit 0ca7a4b75bdbb74073c71e5486ea04fe4a2914ad
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 23 Oct 2014 23:31:24 +0800
Tag:    v2.8.0-rc1

Merge branch '47752-28' of git://github.com/samhemelryk/moodle

commit aed3a3430f2cbc82c1d380cd3c316f8e4373e268
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 23 Oct 2014 23:31:24 +0800
Tag:    v2.8.0-rc1

Merge branch '47752-28' of git://github.com/samhemelryk/moodle

commit 3456ac3ba0692926f86c0c2c7a1a58c49ca35bb1
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 23 Oct 2014 23:31:08 +0800
Tag:    v2.8.0-rc1

Merge branch '47684-28' of git://github.com/samhemelryk/moodle

commit 9a3385cb2daa37473e2f693d05a3f686de3c1a82
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 23 Oct 2014 23:31:08 +0800
Tag:    v2.8.0-rc1

Merge branch '47684-28' of git://github.com/samhemelryk/moodle

commit 276af2a44dc6dee51f9e32c7eb97c5db7ed045b8
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 23 Oct 2014 23:17:49 +0800
Tag:    v2.8.0-rc1

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

commit 25bd390b4b2e7163144328d4db57e4ef03355ba9
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 23 Oct 2014 23:17:49 +0800
Tag:    v2.8.0-rc1

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

commit f335c9a1f1eefd7860188d06b6e10bc004a1fe0d
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 23 Oct 2014 23:16:07 +0800
Tag:    v2.8.0-rc1

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

commit 7b57a751ae0eb06a51de9090390da45084ee40c4
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 23 Oct 2014 23:16:07 +0800
Tag:    v2.8.0-rc1

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

commit 4ade5b11b21207ba7c677574e78d03d49087aaed
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 23 Oct 2014 23:13:11 +0800
Tag:    v2.8.0-rc1

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

commit 98122f9ad410605ffd85bbb8373aef9b3fe91a6e
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 23 Oct 2014 23:13:11 +0800
Tag:    v2.8.0-rc1

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

commit 4fdd69373bfc4ec74f43b0a0ec6a40d4608ac1ae
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 23 Oct 2014 17:50:01 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-47767-master' of git://github.com/xow/moodle

commit cd9f037e040d93aa4a3bbf415b3ddd7ff4f3948f
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 23 Oct 2014 17:50:01 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-47767-master' of git://github.com/xow/moodle

commit fc533908b07eca8d8f92e98342fb6de2b3375bb7
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 23 Oct 2014 17:41:58 +0800
Tag:    v2.8.0-rc1

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

commit 7ea782ab3c9c2f7ee22c50850e7c52f8172b4b3e
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 23 Oct 2014 17:41:58 +0800
Tag:    v2.8.0-rc1

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

commit 11531778512bfeafa863304acab9ae4a30fc9b4b
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 23 Oct 2014 17:19:53 +0800
Tag:    v2.8.0-rc1

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

commit ec007900c0469e1c4de5230f15cb284f7eaac789
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 23 Oct 2014 17:19:53 +0800
Tag:    v2.8.0-rc1

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

commit ea4361b3a551cb6b21a98a89c3c5fc3d3a96f613
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 23 Oct 2014 15:18:31 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-47713-master-fix1' of http://github.com/damyon/moodle

commit bcd015bea61388ceae872ab051de3b61be70c85e
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 23 Oct 2014 15:18:31 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-47713-master-fix1' of http://github.com/damyon/moodle

commit 7a811fb63aa35d6ece3d90094d4740e866dee137
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 22 Oct 2014 17:49:07 +0800
Tag:    v2.8.0-rc1

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

commit e6afd45f96c2d2b22619a71472387d3cfd6c5d14
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 22 Oct 2014 17:49:07 +0800
Tag:    v2.8.0-rc1

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

commit e9afccf2fc22372e2c48dbc3759f6b1cb7167ccf
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Oct 2014 01:28:51 +0800
Tag:    v2.6.6

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

commit 41ce6946d26381d99a80c7d33aecd0aa907e4e52
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Oct 2014 01:28:48 +0800
Tag:    v2.7.3

Merge branch 'MDL-38172_27' of git://github.com/jmvedrine/moodle into MOODLE_27_STABLE

commit 96b12233877656116073c834b1de7947ded7cd05
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Oct 2014 01:28:44 +0800
Tag:    v2.8.0-rc1

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

commit 83b49754d32dc4720730c2609ce873186dab4aa3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Oct 2014 01:12:38 +0800
Tag:    v2.8.0-rc1

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

commit cf3fbf8a0eb14e3c647a7a03e1d4e8745d9b1940
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Oct 2014 00:49:02 +0800
Tag:    v2.8.0-rc1

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

commit 0930a859acf67e17610a4bc89e22b68861a2114d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Oct 2014 00:44:35 +0800
Tag:    v2.7.3

Merge branch 'MDL-47651_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit 6c75bcb5d694e3ee87958dd64148e0272b320e8f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Oct 2014 00:44:33 +0800
Tag:    v2.8.0-rc1

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

commit 2c1a9dcca68e7ad1e5f632a2b4af5d0177323064
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Oct 2014 00:31:58 +0800
Tag:    v2.7.3

Merge branch 'MDL-47666_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit b8992b558521b7eaca75c48194954ba28675b067
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Oct 2014 00:31:57 +0800
Tag:    v2.6.6

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

commit fb45249754f3b0158eb46d57492720d28646213d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Oct 2014 00:31:20 +0800
Tag:    v2.8.0-rc1

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

commit 813e70a35af7b4817e25ce996388fb86ec49f5a5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Oct 2014 00:28:54 +0800
Tag:    v2.7.3

Merge branch 'MDL-47711_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit 3eff69cacea99ae4a1ebb1a6446dfc93b65fe6a6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Oct 2014 00:28:52 +0800
Tag:    v2.6.6

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

commit 6366cc0774fd98affc54bb46b66b55a283e2d502
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Oct 2014 00:28:50 +0800
Tag:    v2.8.0-rc1

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

commit 520308af7edde4b5c33ff3e8976c44aaf4124dcd
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Oct 2014 00:26:38 +0800
Tag:    v2.7.3

Merge branch 'MDL-47726_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit 30fac845783b0e0a54dbeb0716237ff4ec4ac373
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Oct 2014 00:26:36 +0800
Tag:    v2.8.0-rc1

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

commit 670b0d0283ca30426ada7955538328421e89575d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Oct 2014 00:24:22 +0800
Tag:    v2.8.0-rc1

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

commit 7bb357581304a475c8cf08646311147c9c6f518e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Oct 2014 00:21:43 +0800
Tag:    v2.7.3

Merge branch 'MDL-47673_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit 8362a44e32826d7a424494397864f2abf4ce42f4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Oct 2014 00:21:42 +0800
Tag:    v2.6.6

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

commit 22c4db3ede07d813dac6e7322fe29c26f65716e5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Oct 2014 00:20:26 +0800
Tag:    v2.8.0-rc1

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

commit 11c6debb0a257e3026b03af6249ba989987f44ab
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Oct 2014 21:30:46 +0800
Tag:    v2.8.0-rc1

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

commit cd2cfb578334e578fcef5d9fad2a07e7b6df9792
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 17 Oct 2014 21:46:30 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-47363' of git://github.com/marinaglancy/moodle

commit 9b4a87f7e607faac9c9cbdf46f0a0b30042c4cf3
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 17 Oct 2014 18:44:58 +0800
Tag:    v2.8.0-rc1

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

commit bef6e88b5da7a968fe2e69194bce4aca8e4b9e51
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 17 Oct 2014 16:34:39 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-45843-master-fix1' of http://github.com/damyon/moodle

commit e2270952c50969b5c85c0c28d488b5344106c26c
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 17 Oct 2014 00:30:27 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-46599-master' of git://github.com/lameze/moodle

commit f931c9245efb70e6aa5c02a91cb82e397977944c
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 16 Oct 2014 22:14:20 +0800
Tag:    v2.8.0-rc1

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

commit b41bcab4929f617c5e71e0ce68843ae3f0bcded1
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 16 Oct 2014 22:04:14 +0800
Tag:    v2.7.3

Merge branch '47631-27' of git://github.com/samhemelryk/moodle into MOODLE_27_STABLE

commit 5763316186f75e9f3c208c6b37cece374c6f5f8f
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 16 Oct 2014 22:02:24 +0800
Tag:    v2.8.0-rc1

Merge branch '47631-28' of git://github.com/samhemelryk/moodle

commit d65eefdbf13ff753b546b566bfbc67fd2e3035a8
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 16 Oct 2014 20:44:48 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-18229-master' of git://github.com/zbdd/moodle

commit 01c3b4c50befeb8cd7cb74b6754c48475a238006
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 16 Oct 2014 18:50:38 +0800
Tag:    v2.8.0-rc1

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

commit 52af7522361206ae9682005f96ae3300922bbc9b
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 16 Oct 2014 18:46:36 +0800
Tag:    v2.6.6

Merge branch 'm26_MDL-44548' of https://github.com/danmarsden/moodle into MOODLE_26_STABLE

commit 875f3b001ce03a296461295a839055715cf8c763
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 16 Oct 2014 18:46:34 +0800
Tag:    v2.7.3

Merge branch 'm27_MDL-44548' of https://github.com/danmarsden/moodle into MOODLE_27_STABLE

commit afb5161f3761c46247a34f68f64cc7ad94cf379a
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 16 Oct 2014 18:45:22 +0800
Tag:    v2.8.0-rc1

Merge branch 'master_MDL-44548' of https://github.com/danmarsden/moodle

commit 29b097ba25cc2ef00eae7df8a5d5b7271daecf60
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 16 Oct 2014 18:35:32 +0800
Tag:    v2.6.6

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

commit bb4245f1a4b84bec41a46d6f2805d7c6a013129b
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 16 Oct 2014 18:35:29 +0800
Tag:    v2.7.3

Merge branch 'MDL-47710_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit 799190cd2d7c37328cc4bd58bcd4c8bd688a915e
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 16 Oct 2014 18:35:19 +0800
Tag:    v2.8.0-rc1

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

commit 7829a6d1cac6b3df5a97c273ba7abd119a0730ac
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 16 Oct 2014 18:12:01 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-47392-master' of git://github.com/xow/moodle

commit 50c4e8e8b60d013c3301802146a971b29042787d
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 16 Oct 2014 18:07:27 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-47696' of https://github.com/willylee/moodle

commit 45e983598d0319f8c0b1e6a081536b005db5980d
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 16 Oct 2014 18:02:37 +0800
Tag:    v2.6.6

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

commit af236997ddda9ab065975cda21449dedcf2471fe
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 16 Oct 2014 18:02:37 +0800
Tag:    v2.7.3

Merge branch '47684-27' of git://github.com/samhemelryk/moodle into MOODLE_27_STABLE

commit 3370412306512903ddb62679cb7e411d858aacbe
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 16 Oct 2014 18:02:03 +0800
Tag:    v2.8.0-rc1

Merge branch '47684-28' of git://github.com/samhemelryk/moodle

commit 57083769279949c787d240a7d0efe180072b7f92
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 16 Oct 2014 17:57:06 +0800
Tag:    v2.8.0-rc1

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

commit bc636cb602e6a1d8fd16928f00f07cc4ed4bfcca
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 16 Oct 2014 17:53:25 +0800
Tag:    v2.6.6

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

commit 5033b3cf73e30a91abe7f589f617ade4bdf62d63
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 16 Oct 2014 17:52:59 +0800
Tag:    v2.7.3

Merge branch 'MDL-47657-27' of git://github.com/gurgus/moodle into MOODLE_27_STABLE

commit 62b5979cb1741a3f0c4cb395ec38ca773ee8c009
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 16 Oct 2014 17:52:40 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-47657-master' of git://github.com/gurgus/moodle

commit 42da111dbeef45e42cc51629c6471a0744ac579e
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 16 Oct 2014 17:43:52 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-47707-master' of git://github.com/gurgus/moodle

commit 7d92cb57190a7637603a649ee2189c07e451c34e
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 16 Oct 2014 17:40:03 +0800
Tag:    v2.7.3

Merge branch 'MDL-47686-27' of git://github.com/damyon/moodle into MOODLE_27_STABLE

commit bb48e33fda8476a981580d3e42954e7327e795c2
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 16 Oct 2014 17:39:12 +0800
Tag:    v2.8.0-rc1

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

commit 387cb9586efb44d26263d65d5a2b23161519ad32
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 16 Oct 2014 17:03:08 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-47576-master-fixup' of https://github.com/jethac/moodle

commit 529e38d141e173ec832d1977e95f1a1becd16575
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 15 Oct 2014 23:59:06 +0800
Tag:    v2.8.0-rc1

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

commit 33ccfc1f13efb29b1ca470e6ab6b156c1c7d92ce
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 15 Oct 2014 23:56:43 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-47560-master' of git://github.com/gurgus/moodle

commit 560b04b408674de93da6c1a3339e506ea59be3fa
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 15 Oct 2014 23:14:39 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-47243-master' of git://github.com/xow/moodle

commit ac94e15c3dc50cff7f35675f5cbbc4db7461a99a
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 15 Oct 2014 15:41:59 +0800
Tag:    v2.6.6

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

commit 22caa080f9e14f19036bfe0cc757ef688b7f7ecd
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 15 Oct 2014 15:41:23 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-38732-master-2nd' of git://github.com/FMCorz/moodle

commit 8b3c12ec5bd72f4b2a2a8bda9e855f35880832f2
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 15 Oct 2014 15:41:13 +0800
Tag:    v2.7.3

Merge branch 'MDL-38732-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit 4f639ec86b2362efe87f207ece4a69d3229407c2
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 15 Oct 2014 02:11:57 +0800
Tag:    v2.8.0-rc1

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

commit 229f42c2078f2dd44f5c3d2af9273196190ff6c6
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 15 Oct 2014 02:02:13 +0800
Tag:    v2.6.6

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

commit 450e3f27c949099418c4242ad966b16efb9d0058
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 15 Oct 2014 02:02:11 +0800
Tag:    v2.7.3

Merge branch 'MDL-38732-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit 1b07195b289d15ca477f298cc2c84ec2ec7be05e
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 15 Oct 2014 02:00:28 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-38732-master-2nd' of git://github.com/FMCorz/moodle

commit 5a94eeb56d131d8c63010f2b68b4cc3ba87e63a4
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 15 Oct 2014 01:47:30 +0800
Tag:    v2.8.0-rc1

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

commit 05c1422566263c1c2ba3a35fc0c8477bbccae584
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 15 Oct 2014 01:03:11 +0800
Tag:    v2.7.3

Merge branch 'install_27_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_27_STABLE

commit 3283b5b41d3a40a3aea895d03d864c32fc215652
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 15 Oct 2014 01:03:05 +0800
Tag:    v2.6.6

Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE

commit f47265d3a04e5a5ecc451e3cd3c63c7be837957d
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 15 Oct 2014 01:00:44 +0800
Tag:    v2.8.0-rc1

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

commit 8a7b6d292d096eef71fc7666802e25962b692263
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Oct 2014 20:17:36 +0800
Tag:    v2.8.0-rc1

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

commit 3be2f6ac0b7fe6fe1bf107c5d7ad27ab47d4dfaa
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Oct 2014 20:14:19 +0800
Tag:    v2.8.0-rc1

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

commit c7134a38cbc4c73f274c8c94790a0abb714b2834
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Oct 2014 19:27:03 +0800
Tag:    v2.6.6

Merge branch 'wip_MDL-46235_m26_innodbtext' of github.com:skodak/moodle into MOODLE_26_STABLE

commit 7252078d48dc69960a0ac75a99eb5bfbac671ff3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Oct 2014 19:27:03 +0800
Tag:    v2.7.3

Merge branch 'wip_MDL-46235_m27_innodbtext' of github.com:skodak/moodle into MOODLE_27_STABLE

commit ec72585d644ad9d0d1feb52976e1fbcda4144590
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Oct 2014 20:33:56 +0800
Tag:    v2.8.0-rc1

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

commit bb29fe900eb3d23777d18fb488106e15b80719f4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Oct 2014 18:02:59 +0800
Tag:    v2.8.0-rc1

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

commit 42b0ce301d7d308ef5eb45c0e529c349953d2a99
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Oct 2014 17:57:17 +0800
Tag:    v2.8.0-rc1

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

commit 7c50998039e2e1ec9b5f74a7a1e48477f693bfa8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Oct 2014 16:54:02 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-47140-master' of git://github.com/gurgus/moodle

commit 0a96a3e0d67e4cbab13b7088c618d5506a0ff636
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 10 Oct 2014 19:09:14 +0800
Tag:    v2.8.0-beta

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

commit 124da5b9bf2397641264d553824787c5c5deb15b
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 10 Oct 2014 19:08:51 +0800
Tag:    v2.7.3

Merge branch 'install_27_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_27_STABLE

commit b62c768a96c8cd7946ada6ed0ecad2ffedef97bc
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 10 Oct 2014 19:08:44 +0800
Tag:    v2.6.6

Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE

commit fd93980a1c4755cb6df2ede2cd852ddaf9586f7b
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 10 Oct 2014 16:20:30 +0800
Tag:    v2.8.0-beta

Merge branch 'wip-MDL-46576-master-upgrade-fix' of https://github.com/abgreeve/moodle

commit 68cf8d118ecad0d5b821f911a5f956bfa68912c0
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 09 Oct 2014 19:16:43 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46481-master-fixup' of https://github.com/FMCorz/moodle

commit 15ba6a0ded7348b9c33f863ff958f23852d1e11d
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 09 Oct 2014 17:54:19 +0800
Tag:    v2.8.0-beta

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

commit 0993f24df021710271400ff918a402804199a717
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 09 Oct 2014 14:13:18 +0800
Tag:    v2.8.0-beta

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

commit 75381ff958edf67c39d0954ac801e777bf635966
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 09 Oct 2014 14:10:19 +0800
Tag:    v2.6.6

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

commit 79d84a5c72770e3f1a279dbd100bdb05170223ad
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 09 Oct 2014 14:10:19 +0800
Tag:    v2.7.3

Merge branch 'MDL-46647-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit 0835816f9e8c95aded36100d6d2add6cdf280afb
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 09 Oct 2014 14:05:09 +0800
Tag:    v2.8.0-beta

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

commit 66689366a0589aea5b0cd1199bbdfd0db12177bf
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 08 Oct 2014 22:49:58 +0800
Tag:    v2.8.0-beta

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

commit da88accb5f2c8af2a87388ec5ca865589c008928
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 08 Oct 2014 22:33:46 +0800
Tag:    v2.8.0-beta

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

commit f93ee66dd34d99d458d427f49d008311655f72de
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 08 Oct 2014 22:24:42 +0800
Tag:    v2.6.6

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

commit 92cdd5338b8d1c04b9c95d53e5e925f11e9ba433
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 08 Oct 2014 22:24:39 +0800
Tag:    v2.7.3

Merge branch 'MDL-47536_27' of git://github.com/stronk7/moodle into MOODLE_27_STABLE

commit aeb47dd84a33707b7171af6ca032afc7216ee59a
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 08 Oct 2014 22:24:14 +0800
Tag:    v2.8.0-beta

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

commit ea594eb10e63debd2aed52cf00eb5599199dc842
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 08 Oct 2014 21:43:13 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-47084-master' of git://github.com/jleyva/moodle

commit 8b2d52b88d57b5d0d808cbf075ac7f239f8cc7fa
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 08 Oct 2014 18:08:29 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-47389-master' of git://github.com/jleyva/moodle

commit 73c07a7c972dbf36fac93ab06c7046373a46fa99
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 08 Oct 2014 17:42:20 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-45893-master-fixup' of https://github.com/FMCorz/moodle

commit e462093201ca069451119f53b34d8c47500ae45e
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 08 Oct 2014 17:26:13 +0800
Tag:    v2.8.0-beta

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

commit 7b2945b847aba5938ffb814a373da3031ee76361
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 08 Oct 2014 15:54:07 +0800
Tag:    v2.8.0-beta

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

commit 006c84f3e77711a14e248e45ec1d55c726ca2593
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 08 Oct 2014 15:39:31 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-40697_master_alt_usergraded' of https://github.com/markn86/moodle

commit 99675668b423d7e8030cc4f3ee5ccc3f5bbe86e5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Oct 2014 23:52:07 +0800
Tag:    v2.8.0-beta

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

commit c2b4959b36ee5b458e8069fab31d51f8556cf88b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Oct 2014 21:33:07 +0800
Tag:    v2.7.3

Merge branch 'MDL-47518_27' of https://github.com/rlorenzo/moodle into MOODLE_27_STABLE

commit 409318eeff36eb9d47a6a00c58b74fb8bcaf5a48
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Oct 2014 21:32:48 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-47518' of https://github.com/rlorenzo/moodle

commit c31f7c58c1530825220716b93c4058c9a146cea8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Oct 2014 21:25:06 +0800
Tag:    v2.8.0-beta

Merge branch '46481-28' of git://github.com/samhemelryk/moodle

commit 08abbd61c20f89a8990d098941bcb199357ca71f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Oct 2014 16:24:39 +0800
Tag:    v2.8.0-beta

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

commit f5bacd6539ac9b3d4d28465bdd0f0ee22c829d91
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Oct 2014 01:06:13 +0800
Tag:    v2.8.0-beta

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

commit 7c9c1aa3f7f78bea4e5135ba0e4e483fcbc26674
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Oct 2014 23:01:36 +0800
Tag:    v2.6.6

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

commit 647c6bf8a58526ae93fec67ddd19ab22e72880e8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Oct 2014 23:01:31 +0800
Tag:    v2.7.3

Merge branch 'MDL-46054-27' of git://github.com/jleyva/moodle into MOODLE_27_STABLE

commit fb991204a9c962dc2c75cfca1ede8aa6470d0fc8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Oct 2014 23:01:26 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46054-master' of git://github.com/jleyva/moodle

commit a8e9a54165bebcf66cf064713b996be0b1f5f5f0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Oct 2014 22:48:30 +0800
Tag:    v2.6.6

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

commit 8669550962b614febba8033dc313e894f0aed4c8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Oct 2014 22:48:11 +0800
Tag:    v2.7.3

Merge branch 'MDL-45504_27' of git://github.com/stronk7/moodle into MOODLE_27_STABLE

commit 9c054ebbe34dfbe03941fde09028caa3380d58e7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Oct 2014 21:00:20 +0800
Tag:    v2.8.0-beta

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

commit 84f9d6f3df6cde7b03c639fee5782849375ce930
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Oct 2014 19:49:55 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-43089-behat-fixup' of https://github.com/timhunt/moodle

commit 2eb24eb85a2b4b6dd69285000ffa99117d1d383d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Oct 2014 19:11:33 +0800
Tag:    v2.8.0-beta

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

commit 091f2f08a9f739da5fe6f470ebce8831e325ce0f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Oct 2014 15:56:32 +0800
Tag:    v2.6.6

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

commit 17bdcc11aaae5e8eb4e23272d484ed9f92d4545d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Oct 2014 15:56:26 +0800
Tag:    v2.7.3

Merge branch 'MDL-47426_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit d79fd5cd29fbc002f3ab1ebc51d3302a11d805d8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Oct 2014 15:54:09 +0800
Tag:    v2.8.0-beta

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

commit 885b34c751539de2e28e974f2d774c3ec1b863b1
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 02 Oct 2014 22:19:01 +0800
Tag:    v2.7.3

Merge branch 'install_27_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_27_STABLE

commit 59df04c620d0ace3aacbb3cfe365065184009084
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 02 Oct 2014 22:18:55 +0800
Tag:    v2.6.6

Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE

commit 356e857bbb465e85a71a35fcac7bc212fdbd4c15
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 02 Oct 2014 22:18:48 +0800
Tag:    v2.8.0-beta

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

commit 23ba64bdc354f20a56904e6af2acdabbea6ac536
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 02 Oct 2014 16:50:50 +0800
Tag:    v2.7.3

Merge branch 'MDL-37707-27-fixup' of https://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit a1b0efdc714f2a2f249e9c62b94beaf41085d0e9
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 02 Oct 2014 16:49:33 +0800
Tag:    v2.6.6

Merge branch 'MDL-37707-26-fixup' of https://github.com/FMCorz/moodle into MOODLE_26_STABLE

commit 7e704313d2791b70f438ddbc53c447c5d658f738
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 02 Oct 2014 16:48:25 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-37707-master-fixup' of https://github.com/FMCorz/moodle

commit 2e8101f6e67e15d81b45811f4e8a9398ee9b492f
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 02 Oct 2014 16:35:30 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46282-master-fix' of github.com:andrewnicols/moodle

commit f857cd49d9afd0b3db4694d158d0433cfa6d2446
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 01 Oct 2014 15:38:20 +0800
Tag:    v2.7.3

Merge branch 'MDL-47214-27' of github.com:andrewnicols/moodle into MOODLE_27_STABLE

commit f2a8ecfae940810074513e0304a86bfb5584d842
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 01 Oct 2014 15:37:43 +0800
Tag:    v2.8.0-beta

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

commit a96e90e1c0a4cee3dc701ed3bd2e96e307c146aa
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 01 Oct 2014 00:30:20 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46171-master-fix1' of http://github.com/damyon/moodle

commit 6315aa24f90bae4c6e842d7a47f1ba6258486357
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Sep 2014 23:02:09 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46171-master-fix1' of http://github.com/damyon/moodle

commit 5990febb0c0c0eac2d8c339069c8a990f1e13834
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Sep 2014 21:35:29 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-45893-master-fix' of https://github.com/jethac/moodle

commit f736c1b3940d46c1acea9cccdbd5e34ff18d2ae2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Sep 2014 21:04:24 +0800
Tag:    v2.8.0-beta

Merge branch '3034-28' of https://github.com/samhemelryk/moodle

commit d2a072ffced6a6f2840d257e64032e06e574c8d0
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Sep 2014 18:41:42 +0800
Tag:    v2.6.6

Merge branch 'MDL-47385-26' of https://github.com/DmitryNefedov/moodle into MOODLE_26_STABLE

commit 3ddbd23f09d8f10bdb32f262700131a4445c42b3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Sep 2014 18:41:40 +0800
Tag:    v2.7.3

Merge branch 'MDL-47385-27' of https://github.com/DmitryNefedov/moodle into MOODLE_27_STABLE

commit 8f97a5c66a0f996dd4dfc9f33f460e12c8ed6483
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Sep 2014 18:41:37 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-47385-master' of https://github.com/DmitryNefedov/moodle

commit 7cef39b5343865e698438ce1b2e748d7b54a9c2f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Sep 2014 18:07:23 +0800
Tag:    v2.8.0-beta

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

commit d62f99195aa06b4cc592944f24e3f937f784648a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Sep 2014 16:55:03 +0800
Tag:    v2.8.0-beta

Merge branch 'm28_MDL-46127' of https://github.com/totara/moodle

commit 73a37dff730f58465515b590d6e6a64efb2c4a71
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Sep 2014 15:47:31 +0800
Tag:    v2.8.0-beta

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

commit 216b6aa7ee325904e44572f6a001b37745403ffd
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Sep 2014 15:35:19 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-47200-master' of git://github.com/jleyva/moodle

commit b76c62ee3101273c4ee3ca8861adeba0ca04b68a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Sep 2014 15:31:03 +0800
Tag:    v2.6.6

Merge branch 'm26_MDL-47097' of https://github.com/totara/moodle into MOODLE_26_STABLE

commit 2e17bba40b5d212d37043a4305a29f1a77224f4c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Sep 2014 15:31:01 +0800
Tag:    v2.7.3

Merge branch 'm27_MDL-47097' of https://github.com/totara/moodle into MOODLE_27_STABLE

commit 53e9b39b1869461e14d7190df359a2920323cf22
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Sep 2014 15:30:59 +0800
Tag:    v2.8.0-beta

Merge branch 'm28_MDL-47097' of https://github.com/totara/moodle

commit e795621da7618eb954104bcbc8d19e87aba06a49
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Sep 2014 15:29:06 +0800
Tag:    v2.6.6

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

commit 85cb248688bdf40087de68e5f79bf5833b600c6e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Sep 2014 15:29:03 +0800
Tag:    v2.7.3

Merge branch 'MDL-32275-27' of git://github.com/gurgus/moodle into MOODLE_27_STABLE

commit d452f49cf9403fa5a2a53b649fef3b4896e49760
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Sep 2014 15:29:02 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-32275-master' of git://github.com/gurgus/moodle

commit 0645eb68661435cf205f71aaca7f178d51e8532f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Sep 2014 15:03:40 +0800
Tag:    v2.8.0-beta

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

commit b5d4f3e1eb411d580f72861117d0dfaf368c83eb
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Sep 2014 23:25:50 +0800
Tag:    v2.6.6

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

commit 196f94ec0938c2e5735481bb6ba8a2bf1c37c7c0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Sep 2014 23:25:48 +0800
Tag:    v2.7.3

Merge branch 'MDL-46920-27' of git://github.com/jethac/moodle into MOODLE_27_STABLE

commit 1c647a4473d0d17cbc972c6b191cf271d21b6a14
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Sep 2014 23:25:41 +0800
Tag:    v2.8.0-beta

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

commit 5d89699bbb188f1ea6dca187d8edba48424431d0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Sep 2014 19:50:31 +0800
Tag:    v2.6.6

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

commit b79a21df51f529fa767a6661557076347371e975
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Sep 2014 19:50:12 +0800
Tag:    v2.7.3

Merge branch 'wip-mdl-47154-m27' of https://github.com/rajeshtaneja/moodle into MOODLE_27_STABLE

commit 007763c3c4519bc87e89282320b3995c6a295aed
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Sep 2014 19:47:17 +0800
Tag:    v2.6.6

Merge branch 'MDL-47069-26-plugin-dependency' of git://github.com/mudrd8mz/moodle into MOODLE_26_STABLE

commit 6fdf8bcc53cb9ff773016def132c70ff09571e26
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Sep 2014 19:46:53 +0800
Tag:    v2.7.3

Merge branch 'MDL-47069-27-plugin-dependency' of git://github.com/mudrd8mz/moodle into MOODLE_27_STABLE

commit 190ceae64b4ca080214ce458716012812f9fdeea
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Sep 2014 19:46:11 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-47069-master-plugin-dependency' of git://github.com/mudrd8mz/moodle

commit e9eb00a0d78beac337d6398af2c94380ab149075
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Sep 2014 19:29:59 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-47163-master' of git://github.com/jleyva/moodle

commit 17382ec952146e072dfc43872b77774c36622f07
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Sep 2014 19:04:01 +0800
Tag:    v2.8.0-beta

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

commit c7ed7235c764504c1f96b0907d93a94f4c0092b8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Sep 2014 18:58:14 +0800
Tag:    v2.8.0-beta

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

commit 2633f2362721d5e38a689980c16209f25770b7d3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Sep 2014 18:12:29 +0800
Tag:    v2.8.0-beta

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

commit 6b57d95fe32d9dbb41356e9a686e9227197d72cd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Sep 2014 17:55:13 +0800
Tag:    v2.7.3

Merge branch 'MDL-47322-m27' of https://github.com/sammarshallou/moodle into MOODLE_27_STABLE

commit d7737f17c8e30708698978d1e3dde69276b234d3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Sep 2014 17:44:30 +0800
Tag:    v2.6.6

Merge branch 'wip_MDL-47333_m26_fonts' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 43bac317f850d357b213c7aa20b374fe9265ea91
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Sep 2014 17:44:27 +0800
Tag:    v2.7.3

Merge branch 'wip_MDL-47333_m27_fonts' of https://github.com/skodak/moodle into MOODLE_27_STABLE

commit 156cd01e7ba0da3a2501874b433f5d96e4d95e7f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Sep 2014 17:42:50 +0800
Tag:    v2.8.0-beta

Merge branch 'wip_MDL-47333_m28_fonts' of https://github.com/skodak/moodle

commit f03b6121911a96667de83ae69ecd20154bf663df
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Sep 2014 17:30:42 +0800
Tag:    v2.8.0-beta

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

commit c52defd7c4801b89c9b0576dee1fa0d88903b331
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 25 Sep 2014 18:18:00 +0800
Tag:    v2.7.3

Merge branch 'install_27_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_27_STABLE

commit 711d35d7bf0de1a37bc7f0c4237b2bd5c0727644
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 25 Sep 2014 18:17:54 +0800
Tag:    v2.6.6

Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE

commit ce0ce99c72455d1832d163402076356fa40cab71
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 25 Sep 2014 18:17:47 +0800
Tag:    v2.8.0-beta

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

commit 4bcf64b053a4bb346115db46d73cdeac1b8947a4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Sep 2014 17:57:00 +0800
Tag:    v2.8.0-beta

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

commit f37bebbc549b33b9dd50dd2ded940f443c38d489
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Sep 2014 23:13:44 +0800
Tag:    v2.6.6

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

commit 7e36f977b10ba44c8b86e9b61ba09b10183f6545
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Sep 2014 23:13:42 +0800
Tag:    v2.7.3

Merge branch 'MDL-47238_guest_27' of https://github.com/andyjdavis/moodle into MOODLE_27_STABLE

commit 546acfbf67ea99fb08a141a4e7eaf3985cedb5bf
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Sep 2014 23:13:20 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-47238_guest' of https://github.com/andyjdavis/moodle

commit e79420eaf1c1ee6a7b0059dcc634e9fad0934297
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Sep 2014 23:08:19 +0800
Tag:    v2.8.0-beta

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

commit 1034de8d4dda17ae9bdc8a1a7106c42e7f00f873
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Sep 2014 23:03:55 +0800
Tag:    v2.6.6

Merge branch 'MDL-47270-core-component-classmap-ordering_26_STABLE' of https://github.com/mpetrowi/moodle into MOODLE_26_STABLE

commit 42db1010f0ad11d08a364b5bf8f093faa2c8abf1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Sep 2014 23:03:53 +0800
Tag:    v2.7.3

Merge branch 'MDL-47270-core-component-classmap-ordering_27_STABLE' of https://github.com/mpetrowi/moodle into MOODLE_27_STABLE

commit 490263ec681e5a3b212763f06af740aec5e73c34
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Sep 2014 23:03:50 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-47270-core-component-classmap-ordering' of https://github.com/mpetrowi/moodle

commit bd75ef826eb4fbcaacb80db8dcd91a2eac2daf28
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Sep 2014 22:02:51 +0800
Tag:    v2.8.0-beta

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

commit dec70bc47ed1d2ab4d9a7359f84c8dc9a11d02d5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Sep 2014 18:55:50 +0800
Tag:    v2.7.3

Merge branch 'MDL-40006_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit 96ab0104eab270389d022c740b3278981d6ac66f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Sep 2014 18:55:47 +0800
Tag:    v2.8.0-beta

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

commit aebe5eeea0f10fad99208d5fe5e1c68d5f51f84e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Sep 2014 18:39:42 +0800
Tag:    v2.8.0-beta

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

commit 300510afc15c58ec5e36285e13ea7f413481ea20
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Sep 2014 17:57:56 +0800
Tag:    v2.7.3

Merge branch 'MDL-46991-m27' of https://github.com/sammarshallou/moodle into MOODLE_27_STABLE

commit 4c5b60a72c43e6e659489e177b25ef0aa9366494
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Sep 2014 17:57:20 +0800
Tag:    v2.8.0-beta

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

commit 727a43391add0d5e6e1a9e3809c49c3e3807080e
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 18 Sep 2014 14:40:56 +0800
Tag:    v2.8.0-beta

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

commit 5fd02c3a6e4c3599e47aae2e1d85ace11f4f7ea4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Sep 2014 23:07:14 +0800
Tag:    v2.6.6

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

commit b5ecf0dbae0aedc6d8c8627624a807e1c11fe878
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Sep 2014 23:07:09 +0800
Tag:    v2.7.3

Merge branch 'MDL-46195_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit 5ce0af436d40e313bab6940c8347c8d7f977844d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Sep 2014 23:07:05 +0800
Tag:    v2.8.0-beta

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

commit 0908fb42215b0d1c0460f35bac72d9ed42fa06e3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Sep 2014 20:00:24 +0800
Tag:    v2.8.0-beta

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

commit b4820a924900a408f951df4231ba670159c08332
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Sep 2014 19:18:58 +0800
Tag:    v2.6.6

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

commit e7697e57f758cc621c534fcd8e811051c2c40a31
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Sep 2014 19:18:56 +0800
Tag:    v2.7.3

Merge branch 'MDL-46331_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit d1c9b792b0e9998b1d53998ae898bee450051b5c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Sep 2014 18:55:16 +0800
Tag:    v2.8.0-beta

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

commit 6576ab01b62eca03bd5860860ff8d381203589c6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Sep 2014 18:25:27 +0800
Tag:    v2.8.0-beta

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

commit 1c736ac83d069e4eb0c52d34e08180547add64eb
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Sep 2014 18:21:39 +0800
Tag:    v2.6.6

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

commit 7194a13a333ed2037c37d56168b3ca037f3263c9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Sep 2014 18:21:37 +0800
Tag:    v2.7.3

Merge branch 'wip-MDL-47187-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE

commit ffd24d9a61c24dbd8d17ccb038250b91d9bbf353
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Sep 2014 18:08:24 +0800
Tag:    v2.8.0-beta

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

commit 91596eeacc2e39d960d133cbbf3d8badd122e046
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Sep 2014 18:02:48 +0800
Tag:    v2.8.0-beta

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

commit ee566d24828f2de9811d8d58d4cfae6180aa90e9
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 11 Sep 2014 22:44:34 +0800
Tag:    v2.7.3

Merge branch 'install_27_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_27_STABLE

commit e9907e39852b0930f60abd511d849826c02ac749
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 11 Sep 2014 22:44:28 +0800
Tag:    v2.6.6

Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE

commit 6bceb3ba8a96950a5d88fff62605a8e2c1c9ceac
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 11 Sep 2014 22:44:21 +0800
Tag:    v2.8.0-beta

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

commit 4b5fd6eb6d34b5c519d778a8d9c5c1a014146f54
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Sep 2014 17:35:48 +0800
Tag:    v2.8.0-beta

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

commit b30bf418c8fe6beaa4e421df87b5d369b0d01db9
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Sep 2014 17:06:03 +0800
Tag:    v2.7.3

Merge branch 'wip-MDL-47080-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE

commit 68a040b81196c72b0c11c22996b56de0d96a1b96
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Sep 2014 17:05:15 +0800
Tag:    v2.6.6

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

commit fb385cb7af0c4be92cd579e23cf823f598d3a311
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Sep 2014 16:18:00 +0800
Tag:    v2.8.0-beta

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

commit 78f284b6ea89d8999f5814a93967abb48977146f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Sep 2014 15:46:01 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46696-master-fixup' of https://github.com/FMCorz/moodle

commit 982894ab478596b148cd40625d71dd0d21a42080
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Sep 2014 15:11:16 +0800
Tag:    v2.6.6

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

commit 20758f187d34cf073fc8abd022cf1a3151e49883
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Sep 2014 15:11:12 +0800
Tag:    v2.7.3

Merge branch 'wip-MDL-46834-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE

commit c35e9b73a54124f2e3afdba0034ff15ceceb934d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Sep 2014 15:06:40 +0800
Tag:    v2.8.0-beta

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

commit 1dd2ce2ecc5ddb8ad7740d0aafd2932e01b8d345
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Sep 2014 00:26:59 +0800
Tag:    v2.6.6

Merge branch 'MDL-40451-m26-random-glossary-block-title' of git://github.com/amandadoughty/moodle into MOODLE_26_STABLE

commit 937ccd60b2b275997067babc1f3f369ec592a8bb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Sep 2014 00:26:57 +0800
Tag:    v2.7.3

Merge branch 'MDL-40451-m27-random-glossary-block-title' of git://github.com/amandadoughty/moodle into MOODLE_27_STABLE

commit 99e221f844295777275f703df5d49ea5a6c14a90
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Sep 2014 00:26:56 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-40451-master-random-glossary-block-title' of git://github.com/amandadoughty/moodle

commit f75e12e12b2b0bbd9e2a6c003221ad45acbba16f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Sep 2014 23:30:59 +0800
Tag:    v2.6.6

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

commit 98cf5b4f0c6d2975ef87b97c08ff03ea24a92566
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Sep 2014 23:30:56 +0800
Tag:    v2.7.3

Merge branch 'wip-MDL-45602-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE

commit 205cd43352554db9fcad915fd56f92c4446fb123
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Sep 2014 23:30:33 +0800
Tag:    v2.8.0-beta

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

commit a3b93be8f8efe1bfe88fc915213d121debbfb4ed
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Sep 2014 23:23:59 +0800
Tag:    v2.8.0-beta

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

commit 01f8713aba0ad5b3d0ed2f6d0f1c1b648b0772b9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Sep 2014 22:31:14 +0800
Tag:    v2.6.6

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

commit 0072e5d5598e8253531734596a4c255bda727f96
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Sep 2014 22:31:13 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46586-master' of git://github.com/jleyva/moodle

commit 01afa79fe7bb99e34ceab36f4bbc0ad13ed233cc
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Sep 2014 22:31:12 +0800
Tag:    v2.7.3

Merge branch 'MDL-46586-27' of git://github.com/jleyva/moodle into MOODLE_27_STABLE

commit cac9e2e27004665211c69ff07efc948f8a745301
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Sep 2014 22:16:41 +0800
Tag:    v2.6.6

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

commit 9b31e3bc3f02451c49e8251868590ae066e8b217
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Sep 2014 22:16:39 +0800
Tag:    v2.7.3

Merge branch 'wip-MDL-43739-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE

commit 7b41ee275207ab5cce4561dc6942b235280b737e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Sep 2014 22:16:38 +0800
Tag:    v2.8.0-beta

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

commit 735c7ee41a3cc67e09b1fef96026ae7c30053430
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Sep 2014 21:28:30 +0800
Tag:    v2.8.0-beta

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

commit be516f9452475a9dab5b8f4bb5fad6794611e97f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Sep 2014 19:22:30 +0800
Tag:    v2.6.6

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

commit ee977370d2b2531859cb789abbcd02ea149001f2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Sep 2014 19:22:28 +0800
Tag:    v2.7.3

Merge branch 'MDL-46982_m27' of https://github.com/shashirepo/moodle into MOODLE_27_STABLE

commit 7f2c8214204b879c9de0b1469840a6a634e6212a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Sep 2014 19:22:27 +0800
Tag:    v2.8.0-beta

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

commit 5e61e7b667c6e7b50880a8964ed6bcfa9e8bfb84
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Sep 2014 19:19:34 +0800
Tag:    v2.7.3

Merge branch 'MDL-47014-27' of git://github.com/jleyva/moodle into MOODLE_27_STABLE

commit 45121f9b2563e6a3dcb3e42738fda1076946781a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Sep 2014 19:19:24 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-47014' of git://github.com/jleyva/moodle

commit 1a14acc38ec37689e00da076e186d376adb11763
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Sep 2014 19:16:18 +0800
Tag:    v2.6.6

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

commit 9ded19fe12e76f0e2365661d0672cf84d9f2ab48
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Sep 2014 19:16:12 +0800
Tag:    v2.7.3

Merge branch 'wip-MDL-46254-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE

commit b93cd58dd342cb81d0f22f7d3aabd84981133f6b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Sep 2014 19:14:51 +0800
Tag:    v2.8.0-beta

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

commit 023d75851383d8a25b2c92af4adcc0031e799e0a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Aug 2014 21:28:22 +0800
Tag:    v2.8.0-beta

Merge branch 'wip_MDL-46561_m28_sessexists' of https://github.com/skodak/moodle

commit 231520807ed5b1b0aca16b7e4d5e81ff456e1658
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Aug 2014 20:58:38 +0800
Tag:    v2.8.0-beta

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

commit 70c16c533688cc23c1d54a173e98d1669ed004ed
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Aug 2014 18:34:05 +0800
Tag:    v2.8.0-beta

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

commit 82b7d129d70e10218764360ccb8cd22dd14d40e0
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Aug 2014 18:08:13 +0800
Tag:    v2.6.5

Merge branch 'MDL-43824-M26' of git://github.com/lazydaisy/moodle into MOODLE_26_STABLE

commit 6a9a7005b02a5c9f8634a69e77ddeada0bda5ed3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Aug 2014 18:08:11 +0800
Tag:    v2.7.2

Merge branch 'MDL-43824-M27' of git://github.com/lazydaisy/moodle into MOODLE_27_STABLE

commit 134b1e4c90ff5b9b141892358bc60d4288b21fe5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Aug 2014 18:06:53 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-43824-master' of git://github.com/lazydaisy/moodle

commit 57fdca8cec16f0018537cca9e07581cca601876f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Aug 2014 18:04:15 +0800
Tag:    v2.8.0-beta

Merge branch 'wip_MDL-46660_m28_memcache' of https://github.com/skodak/moodle

commit a672c8337f3221ea56e161039f232e081fa716cf
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Aug 2014 18:02:20 +0800
Tag:    v2.6.5

Merge branch 'm26_MDL-46718' of https://github.com/greg-or/moodle-mod_assign into MOODLE_26_STABLE

commit 2d9145638cedc6e4d19b5b1ec0d36f8509fcbb73
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Aug 2014 18:02:18 +0800
Tag:    v2.7.2

Merge branch 'm27_MDL-46718' of https://github.com/greg-or/moodle-mod_assign into MOODLE_27_STABLE

commit 62e30bfbcd14772aa1c2f7ffe990e4b609098549
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Aug 2014 18:02:18 +0800
Tag:    v2.8.0-beta

Merge branch 'master_MDL-46718' of https://github.com/greg-or/moodle-mod_assign

commit c7a042bfcfa4373b00c3adf55a657be333d44721
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Aug 2014 00:06:54 +0800
Tag:    v2.8.0-beta

Merge branch 'master_MDL-46524' of https://github.com/greg-or/moodle-mod_assign

commit 2f035def0f14285114894656890416afb378eefc
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Aug 2014 23:53:51 +0800
Tag:    v2.8.0-beta

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

commit 86a42029e361ed3a88c2d7d8a32f584e259dc64c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Aug 2014 21:38:47 +0800
Tag:    v2.6.5

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

commit b4875aa3485cb467950292d042675fc1bf792ce3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Aug 2014 21:38:35 +0800
Tag:    v2.7.2

Merge branch 'MDL-46496-27' of git://github.com/andrewnicols/moodle into MOODLE_27_STABLE

commit c068b0814bf055426590e07ade25459f694400ed
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Aug 2014 21:38:33 +0800
Tag:    v2.8.0-beta

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

commit 278c04a4141ada263bc142f5717c4d9fd24b14a0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Aug 2014 21:31:06 +0800
Tag:    v2.6.5

Merge branch 'm26_MDL-44015' of https://github.com/greg-or/moodle-mod_assign into MOODLE_26_STABLE

commit 3b4cc68ff4b33dbe6395a9ea115df0a90f35d810
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Aug 2014 21:31:04 +0800
Tag:    v2.7.2

Merge branch 'm27_MDL-44015' of https://github.com/greg-or/moodle-mod_assign into MOODLE_27_STABLE

commit d3014cca39ae390abcd5859519768799888b27fd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Aug 2014 21:31:02 +0800
Tag:    v2.8.0-beta

Merge branch 'master_MDL-44015' of https://github.com/greg-or/moodle-mod_assign

commit db6c4fc975d162817de34079fc17e4bce519fe46
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Aug 2014 21:13:17 +0800
Tag:    v2.6.5

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

commit 2f0d26c522c984761f187a0a21a1c0be65a285f4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Aug 2014 21:13:14 +0800
Tag:    v2.7.2

Merge branch 'MDL-46688_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit c5186b2251551ec639ae1216ac86cd89cbbd251e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Aug 2014 21:13:12 +0800
Tag:    v2.8.0-beta

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

commit eede6aae430f10fd03fa3748c81612023c2cc2cc
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Aug 2014 18:24:20 +0800
Tag:    v2.7.2

Merge branch 'MDL-45759-27' of git://github.com/andrewnicols/moodle into MOODLE_27_STABLE

commit 463d2813779b0b2d5c089014cefded3746c781d3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Aug 2014 18:24:19 +0800
Tag:    v2.8.0-beta

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

commit 7051114f00bf1ffc07cb07bc5e3102da83b69b83
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Aug 2014 17:41:44 +0800
Tag:    v2.6.5

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

commit a623fdf11b8048ae45c543f1c00b33a6a2625026
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Aug 2014 17:41:42 +0800
Tag:    v2.7.2

Merge branch 'wip-MDL-30668-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE

commit 0bd41a9ccf42876500583ee00757027ba3c7eb3f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Aug 2014 17:41:40 +0800
Tag:    v2.8.0-beta

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

commit 61d3898de9e47cd3711e884a4b02ea63bc2daa98
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Aug 2014 15:37:35 +0800
Tag:    v2.7.2

Merge branch 'MDL-46748-27' of git://github.com/damyon/moodle into MOODLE_27_STABLE

commit ac7584c85b212496d4a4a8ce54cdaa2792ba8f87
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Aug 2014 15:37:35 +0800
Tag:    v2.8.0-beta

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

commit a43be9d8f250de48cf41d9af2c6a80f932d43e2a
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 06 Aug 2014 02:24:32 +0800
Tag:    v2.8.0-beta

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

commit f8512242566cabf89eb30f4869b43c4f455b7347
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 06 Aug 2014 02:14:15 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46175_strings' of https://github.com/andyjdavis/moodle

commit f28ce6eb2e01e7e09eaa8934000a9c61e35addd3
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 31 Jul 2014 16:37:20 +0800
Tag:    v2.7.2

Merge branch 'install_27_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_27_STABLE

commit f73bb3a21a5e85b5eaa3cc794d998bc447583c28
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 31 Jul 2014 16:37:14 +0800
Tag:    v2.6.5

Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE

commit d7e09cb9fbbf495d781ef3111906c9202ec568d2
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 31 Jul 2014 16:37:08 +0800
Tag:    v2.8.0-beta

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

commit 37c2490aa365c56b9b396fefe7c4b1f919ebf201
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Jul 2014 23:32:52 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46591-master' of git://github.com/danpoltawski/moodle

commit 4fe1c7647c6c222b73bb5c45207acf726dfb4713
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Jul 2014 19:04:34 +0800
Tag:    v2.6.5

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

commit 0fbda60bb3d78c5d2587b8d33dba9d0c7231cd94
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Jul 2014 19:04:32 +0800
Tag:    v2.7.2

Merge branch 'MDL-46236_27' of git://github.com/nobelium/moodle into MOODLE_27_STABLE

commit 2ac36ad5873e34af844b5265cece6d9765769674
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Jul 2014 19:04:29 +0800
Tag:    v2.8.0-beta

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

commit 5d9fa99bffea1f2b3edafdacffadca8f246fc0a3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Jul 2014 18:57:47 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46456' of https://github.com/aolley/moodle

commit 765ba4ce1e98c062c435bb1d5241f2b0cfb5f7e4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Jul 2014 15:50:40 +0800
Tag:    v2.6.5

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

commit 74980995b4e78dacebc295d369326a67234ce6c8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Jul 2014 15:50:37 +0800
Tag:    v2.7.2

Merge branch 'wip-MDL-46338-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE

commit be5a27f2f55ec76ab3e05f4acae72348398d118f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Jul 2014 15:50:37 +0800
Tag:    v2.8.0-beta

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

commit acadd22a65cdf53d441fc95337fb687c27ba5081
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Jul 2014 00:25:05 +0800
Tag:    v2.7.2

Merge branch 'MDL-46206-27' of git://github.com/jethac/moodle into MOODLE_27_STABLE

commit 70acf8388b7a7d51df686db9e327b3ee9041f70a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Jul 2014 00:25:04 +0800
Tag:    v2.8.0-beta

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

commit 0a346972f31cc3b46d3da09d4c8bc01837f1f470
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Jul 2014 19:54:19 +0800
Tag:    v2.6.5

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

commit acafcb18f59d88dc4c6a4609faa6e490857096ca
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Jul 2014 19:54:17 +0800
Tag:    v2.7.2

Merge branch 'MDL-45594_m27' of git://github.com/markn86/moodle into MOODLE_27_STABLE

commit 40864d30acfcdb886803bca45e167c599a9a0a6e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Jul 2014 19:54:15 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-45594_master' of git://github.com/markn86/moodle

commit 54021dcedbf5d987e8be526e4dd90180eda7a9bc
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Jul 2014 19:49:17 +0800
Tag:    v2.6.5

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

commit 71f4cb812c4deff0a99f883dad3a6ed68fbde81e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Jul 2014 19:49:15 +0800
Tag:    v2.7.2

Merge branch 'wip-MDL-46503-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE

commit 5a8f38d712068064d1f59039b3980abb442d0dac
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Jul 2014 19:49:13 +0800
Tag:    v2.8.0-beta

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

commit abeb9d654463c651c5ffb0d08d1ec99691b46b4c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Jul 2014 19:47:35 +0800
Tag:    v2.6.5

Merge branch 'm26_MDL-45715' of https://github.com/danmarsden/moodle into MOODLE_26_STABLE

commit b1f78408a5386e9543686d9d0af18fdef42603cb
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Jul 2014 19:47:32 +0800
Tag:    v2.7.2

Merge branch 'm27_MDL-45715' of https://github.com/danmarsden/moodle into MOODLE_27_STABLE

commit d4a89aa5000020593614711ef73cead35cd15808
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Jul 2014 19:47:30 +0800
Tag:    v2.8.0-beta

Merge branch 'master_MDL-45715' of https://github.com/danmarsden/moodle

commit 14a3ccc96da2c23fd5c34167d02e1323fb01d113
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Jul 2014 19:01:24 +0800
Tag:    v2.8.0-beta

Merge branch 'm28_MDL-46431' of https://github.com/totara/moodle

commit 1669cf37f07761a46d8185cda6975768c753c55b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Jul 2014 18:59:03 +0800
Tag:    v2.7.2

Merge branch 'MDL-46459_27' of git://github.com/jleyva/moodle into MOODLE_27_STABLE

commit 4709708d4889e12f0f4a621ceaacb80c4cde6c51
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Jul 2014 18:59:02 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46459' of git://github.com/jleyva/moodle

commit dde5ae7cf7d4b56788b194df4ca1ff27956e61b2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Jul 2014 18:52:09 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46463_rss_style' of https://github.com/andyjdavis/moodle

commit 2c28f42baef9f58d9f76e1a13d36c1b26e71a68f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Jul 2014 18:49:40 +0800
Tag:    v2.6.5

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

commit 71e7387f43261f970a0e312cb7cf1b1fb5ae579c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Jul 2014 18:49:38 +0800
Tag:    v2.7.2

Merge branch 'MDL-46433-27' of git://github.com/lameze/moodle into MOODLE_27_STABLE

commit 733d20a0e8f7b7d3e3c473717af799439b47d486
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Jul 2014 18:49:37 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46433-master' of git://github.com/lameze/moodle

commit f5b49d80041e257b51bc45f2331f87d7048b0de5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Jul 2014 17:56:50 +0800
Tag:    v2.6.5

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

commit 4eb9f7dd72c9e243c105825251d81815b5b0f6d8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Jul 2014 17:56:43 +0800
Tag:    v2.7.2

Merge branch 'MDL-46504_27' of git://github.com/dmonllao/moodle into MOODLE_27_STABLE

commit aba225fd3a73a21cfada03721dba3fa9f7152f1e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Jul 2014 17:45:17 +0800
Tag:    v2.8.0-beta

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

commit d8d240ee63731403c5e73052cb2a9f65e7e1c736
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Jul 2014 17:41:05 +0800
Tag:    v2.8.0-beta

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

commit 6ca7efb157af91a05639f23a5f4589041421bebe
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Jul 2014 16:51:01 +0800
Tag:    v2.7.2

Merge branch 'install_27_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_27_STABLE

commit 899c251521ad17d4c2d11b41cc79ec2e47a2f283
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Jul 2014 16:50:55 +0800
Tag:    v2.6.5

Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE

commit 25f0ec805ccc6021b3c581837e0119560d132405
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Jul 2014 16:50:49 +0800
Tag:    v2.8.0-beta

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

commit 92d4bcd9f76612ab32eace96839672e34dae00f7
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Jul 2014 15:24:26 +0800
Tag:    v2.7.2

Merge branch 'MDL-46017-27' of git://github.com/damyon/moodle into MOODLE_27_STABLE

commit 1911cf3c990c9879360eb80d3db44fabdaa8f510
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Jul 2014 15:24:24 +0800
Tag:    v2.8.0-beta

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

commit 406e47123d5eb4c5211112b4f6c8c33d8481fbd1
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Jul 2014 00:09:48 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-45965_master' of https://github.com/Syxton/moodle

commit 12bdea2eb557d8dc3547c23969906dd0e8f13e7d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jul 2014 23:32:26 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-35864' of https://github.com/danielneis/moodle

commit 5199fcd7cb625a84d3b9f8140fa962824f3fed38
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jul 2014 22:56:59 +0800
Tag:    v2.6.5

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

commit a7e348e93783dee95da90c98401c8c5730106d2f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jul 2014 22:56:58 +0800
Tag:    v2.7.2

Merge branch 'MDL-37509-27' of git://github.com/damyon/moodle into MOODLE_27_STABLE

commit 02213adfd0b19048836c35b0f89511a11c65579d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jul 2014 22:56:55 +0800
Tag:    v2.8.0-beta

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

commit afffcb9472ec288cd9f0c17c866824dcfa8426ad
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jul 2014 21:33:33 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-44925-master' of https://github.com/dthies/moodle

commit 00d4919e6980def7fbd505d6705e903c1c94ab02
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jul 2014 19:01:06 +0800
Tag:    v2.6.5

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

commit eba7490c31f24e8269f1f9e3d94ff19a478de249
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jul 2014 19:01:04 +0800
Tag:    v2.7.2

Merge branch 'MDL-34248_m27' of https://github.com/markn86/moodle into MOODLE_27_STABLE

commit 6442e5c7edb5bb462cafcb6bba7e287275c61d87
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jul 2014 19:01:04 +0800
Tag:    v2.8.0-beta

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

commit 5f7ab6e9497ee55c0cc0f5c8528a1e8f548df707
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jul 2014 16:33:01 +0800
Tag:    v2.8.0-beta

Merge branch '45828-28' of git://github.com/samhemelryk/moodle

commit e14bbecd574788390aa477d250fb80ae55910556
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jul 2014 16:07:27 +0800
Tag:    v2.6.5

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

commit a4798ada526e1caaa8bb7af21d4e528794d24681
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jul 2014 16:07:25 +0800
Tag:    v2.7.2

Merge branch '45724-27' of git://github.com/samhemelryk/moodle into MOODLE_27_STABLE

commit d28d270bca9cb80d884108ec0ede62ce85d807fe
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Jul 2014 16:07:16 +0800
Tag:    v2.8.0-beta

Merge branch '45724-28' of git://github.com/samhemelryk/moodle

commit 08348b8f86c6d68a7cec9a403e65ab2e3fe9c994
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Jul 2014 21:11:46 +0800
Tag:    v2.7.2

Merge branch 'MDL-46386-27' of https://github.com/merrill-oakland/moodle into MOODLE_27_STABLE

commit 6188c8ebab67dc6faafb0608f7e7d1dc67fac4a5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Jul 2014 21:11:39 +0800
Tag:    v2.8.0-beta

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

commit f5fea4019a8e78dff965ec2e53a783e6fe05b16d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Jul 2014 21:03:58 +0800
Tag:    v2.8.0-beta

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

commit 087e7d8fb16906fb2dce5bfb95e137afbf84838f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Jul 2014 19:31:51 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46316_notes2' of https://github.com/andyjdavis/moodle

commit 65f00f063b96b510463e64b7cbe4e06db43ed706
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Jul 2014 19:09:10 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-45847_master' of https://github.com/Syxton/moodle

commit 724d7abe8b19e42d216f01a36212b3f2e578714c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Jul 2014 17:20:55 +0800
Tag:    v2.8.0-beta

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

commit c081554c0c5114a4fc99e82741a5c189c9138392
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Jul 2014 16:59:08 +0800
Tag:    v2.6.5

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

commit ab156686fff8006c6e59a1aa805f748ea7c34d99
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Jul 2014 16:59:06 +0800
Tag:    v2.7.2

Merge branch '46335-27' of git://github.com/samhemelryk/moodle into MOODLE_27_STABLE

commit 1d3b11ec48b8ef3c81df103394906ac100ecf509
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Jul 2014 16:59:04 +0800
Tag:    v2.8.0-beta

Merge branch '46335-28' of git://github.com/samhemelryk/moodle

commit b73aaa678c7a54097b5c3f10555689996bccb9a5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Jul 2014 16:54:59 +0800
Tag:    v2.6.5

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

commit 1fc8ebf0859d1fdc98eb7d6762f931b616a0627f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Jul 2014 16:54:57 +0800
Tag:    v2.7.2

Merge branch 'MDL-46370_27' of https://github.com/moodlerooms/moodle into MOODLE_27_STABLE

commit f9075a788842c547e94162fb04bf0afd2186c4da
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Jul 2014 16:54:56 +0800
Tag:    v2.8.0-beta

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

commit 96d73266efa91f046991f789e87991975ac1b26c
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 17 Jul 2014 16:22:51 +0800
Tag:    v2.7.2

Merge branch 'install_27_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_27_STABLE

commit daf2f7612596963daebf8b1a81db0e9e840e1fc5
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 17 Jul 2014 16:22:46 +0800
Tag:    v2.6.5

Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE

commit fcc7e4d9b32b1b8b614225c01ee935f7da41c075
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 17 Jul 2014 16:22:40 +0800
Tag:    v2.8.0-beta

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

commit bf394372d8dfa78f374a69733ea07aabd9b463c0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Jul 2014 23:09:29 +0800
Tag:    v2.7.2

Merge branch 'MDL-42752-27' of git://github.com/phalacee/moodle into MOODLE_27_STABLE

commit 1aefe49544298d8066c1caf10dee895971674458
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Jul 2014 23:09:28 +0800
Tag:    v2.6.5

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

commit c5afe577c9ec8a735964222a13511a708bd0231e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Jul 2014 23:06:13 +0800
Tag:    v2.8.0-beta

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

commit 90e35c89298cae7bcf53f5248ddb44e09c54603b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Jul 2014 22:33:24 +0800
Tag:    v2.6.5

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

commit bbcbbcd130000ea3e9149dfec3ac9b56d641bf0f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Jul 2014 22:33:13 +0800
Tag:    v2.7.2

Merge branch 'MDL-46218_disabled2_27' of https://github.com/andyjdavis/moodle into MOODLE_27_STABLE

commit 2df87a9d2a71fa2130840198baf29e6e4ac72be3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Jul 2014 22:33:12 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46218_disabled2' of https://github.com/andyjdavis/moodle

commit 8bbc71406dda18f5c48917cb23c2a26591e1fabd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Jul 2014 22:15:07 +0800
Tag:    v2.6.5

Merge branch 'm26_MDL-46226' of https://github.com/totara/moodle into MOODLE_26_STABLE

commit 8f15eebc226170db0889bea1fc248e9f4f9c2445
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Jul 2014 22:13:45 +0800
Tag:    v2.7.2

Merge branch 'm27_MDL-46226' of https://github.com/totara/moodle into MOODLE_27_STABLE

commit 388debc7c5cf757745d54908f7577a2f8c3bdec2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Jul 2014 22:13:32 +0800
Tag:    v2.8.0-beta

Merge branch 'm28_MDL-46226' of https://github.com/totara/moodle

commit d3181cc8b5a582fb2415d82cf94b5d472daa66f0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Jul 2014 20:12:43 +0800
Tag:    v2.8.0-beta

Merge branch 'm28_MDL-46250' of https://github.com/totara/moodle

commit 080d86e39f55b7c2547b2e525f2915bbb28395d2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Jul 2014 19:33:59 +0800
Tag:    v2.8.0-beta

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

commit e0708141f80045ad416e64eb1c5503d4ccd82174
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jul 2014 22:31:53 +0800
Tag:    v2.7.1

Merge branch 'MDL-45599-27-addons' of git://github.com/mudrd8mz/moodle into MOODLE_27_STABLE

commit 59ba5a5952bf80f36b5e59e25b318d02f9ac74f4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jul 2014 22:31:50 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-45599-master-addons' of git://github.com/mudrd8mz/moodle

commit 76b012d6119ba02b12c5aedbf42a44af988ef2a7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jul 2014 21:18:01 +0800
Tag:    v2.7.1

Merge branch 'MDL-44492_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit 648bf857d3c4185438de57154a38c9478e33539e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jul 2014 21:17:58 +0800
Tag:    v2.6.4

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

commit 8bdcbcaf7db6c55f0b08571ee002317b10ca71f0
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jul 2014 21:17:56 +0800
Tag:    v2.8.0-beta

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

commit 67b37043180a5954c2b25fbcbd6a221aee40c1a9
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jul 2014 18:29:03 +0800
Tag:    v2.7.1

Merge branch 'MDL-45381_m27' of git://github.com/markn86/moodle into MOODLE_27_STABLE

commit 79269b05f0a10389aefa05c27c5b3d2428ccedb4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jul 2014 18:28:58 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-45381_master' of git://github.com/markn86/moodle

commit 077703b235796035d4f043959818edbc2ed58774
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jul 2014 17:50:56 +0800
Tag:    v2.6.4

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

commit 37e7d91b8c4133c7b04de82446f1fbeaa04b96ed
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jul 2014 17:50:55 +0800
Tag:    v2.7.1

Merge branch 'MDL-45596-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit 772d658f1d879874fb8ed47e2510ff97db7cbdee
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jul 2014 17:50:55 +0800
Tag:    v2.8.0-beta

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

commit d830bd9a334852ed461cea005cc6e64685728ea3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jul 2014 15:32:37 +0800
Tag:    v2.6.4

Merge branch 'MDL-46231-26-en_fix' of git://github.com/mudrd8mz/moodle into MOODLE_26_STABLE

commit 22051a4e3424bd1a1154f13ba91bcb55b7065e35
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jul 2014 15:32:35 +0800
Tag:    v2.7.1

Merge branch 'MDL-46231-27-en_fix' of git://github.com/mudrd8mz/moodle into MOODLE_27_STABLE

commit 4c8fab291b8f4a6c20c349e78cfdbaea8ab5caa1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jul 2014 15:32:32 +0800
Tag:    v2.8.0-beta

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

commit 7047adfdbe7201f5a559336ac87e18139c3fe5ab
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Jul 2014 23:27:34 +0800
Tag:    v2.6.4

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

commit 9945bcec41e4bbbf5feced41516e872cadc2bf83
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Jul 2014 23:27:32 +0800
Tag:    v2.7.1

Merge branch 'MDL-42393-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit e3541d3c1bbcc7f1996e38783cf0af92502f51e2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Jul 2014 23:27:29 +0800
Tag:    v2.8.0-beta

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

commit 47de7aac759f0e4754b4156b2df094e9c7878b5c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Jul 2014 23:10:28 +0800
Tag:    v2.6.4

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

commit b4ac5653edc71aa6a8724d17aeb62b287d7b55a3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Jul 2014 23:10:26 +0800
Tag:    v2.7.1

Merge branch 'MDL-41389_m27' of https://github.com/markn86/moodle into MOODLE_27_STABLE

commit 10b4bda9161062aa44dbafdcac99eace884cfcdb
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 03 Jul 2014 17:53:24 +0800
Tag:    v2.7.1

Merge branch 'install_27_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_27_STABLE

commit 7b414e625847f5b520e2b70b3ba76c71c9c0bed2
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 03 Jul 2014 17:53:18 +0800
Tag:    v2.6.4

Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE

commit 0c55700691e4f32e6661c03427d7d40221865178
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 03 Jul 2014 17:53:11 +0800
Tag:    v2.8.0-beta

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

commit 92267ed9fefd121a49ab65a2de2086d49399d2af
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 02 Jul 2014 00:29:18 +0800
Tag:    v2.6.4

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

commit ab6ae906cdc92c5964eeb2ccf0000da7ebb3d85e
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 02 Jul 2014 00:29:16 +0800
Tag:    v2.7.1

Merge branch 'MDL-46063_27' of git://github.com/schach/moodle into MOODLE_27_STABLE

commit bbe04d27f2daeecb935e8c8a6305519abdae1309
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 02 Jul 2014 00:29:14 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46063_master' of git://github.com/schach/moodle

commit d520b925796e688a43a85b67f89ec3ae3d5068db
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 01 Jul 2014 23:34:32 +0800
Tag:    v2.6.4

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

commit f45b59d4273f3b85f982172ee35155155a5a0f64
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 01 Jul 2014 23:34:29 +0800
Tag:    v2.7.1

Merge branch 'MDL-46036_survey_27' of https://github.com/andyjdavis/moodle into MOODLE_27_STABLE

commit c07969400acbfee1c3ea0beb130ad39c849f6a0e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 01 Jul 2014 22:58:11 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46036_survey' of https://github.com/andyjdavis/moodle

commit e065becdd4ed63399662877b543eeae31345b195
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 01 Jul 2014 22:41:04 +0800
Tag:    v2.8.0-beta

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

commit 366124d22213f82382bd3f5936879d981b435969
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 01 Jul 2014 21:20:53 +0800
Tag:    v2.7.1

Merge branch 'MDL-46107_27' of https://github.com/totara/openbadges into MOODLE_27_STABLE

commit e666c72330e99d311233c1075758907412b9a5cb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 01 Jul 2014 21:20:53 +0800
Tag:    v2.6.4

Merge branch 'MDL-46107_26' of https://github.com/totara/openbadges into MOODLE_26_STABLE

commit 4a27b061bf27c6d7f96e4e9f4f69acfd548a4ba2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 01 Jul 2014 21:20:44 +0800
Tag:    v2.8.0-beta

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

commit 89203e11a79feed7b20f9bf210a38d522b9c00b1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 01 Jul 2014 21:16:22 +0800
Tag:    v2.7.1

Merge branch 'MDL-4013-stable27' of https://github.com/MorrisR2/moodle into MOODLE_27_STABLE

commit c4058e6e0c9e70aa77f671bd088e8bfc4eef88ad
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 01 Jul 2014 21:16:04 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46163_category_selector_renders_as_nested_form' of https://github.com/MorrisR2/moodle

commit 9b19282346029b6a8f43cc3e9b3f03e493ecfbf1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 01 Jul 2014 20:37:56 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46161_files_reference_index' of git://github.com/davosmith/moodle

commit 2a957cda1795251818d579ecba807163711a795c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 01 Jul 2014 17:53:59 +0800
Tag:    v2.8.0-beta

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

commit db1cf750bdcd936c64aa85fb0475c024b1f8b80d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 01 Jul 2014 17:39:18 +0800
Tag:    v2.6.4

Merge branch 'wip_MDL-46099_m26_userglobal' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit dd83fbfbbcf3cca891c80184815a11aa392eecb8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 01 Jul 2014 17:39:15 +0800
Tag:    v2.7.1

Merge branch 'wip_MDL-46099_m27_userglobal' of https://github.com/skodak/moodle into MOODLE_27_STABLE

commit 99fbe162115d81812bcdca4528b4b103b9bcd6ed
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 01 Jul 2014 17:39:14 +0800
Tag:    v2.8.0-beta

Merge branch 'wip_MDL-46099_m28_userglobal' of https://github.com/skodak/moodle

commit 5474aa7a6d1bd20327721e3708fb1d1eeffa6d4d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 01 Jul 2014 17:37:50 +0800
Tag:    v2.8.0-beta

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

commit 2d8c48a995486d9e66c6346c1fc880db3ecd4abb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 01 Jul 2014 17:12:52 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-40457-question_bank_plugins_columns' of git://github.com/MorrisR2/moodle

commit cb49ea51ebc09bc744de13714e2671497ff3d807
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Jun 2014 22:26:39 +0800
Tag:    v2.6.4

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

commit 1e9dce0df49e94271f5c9f6149fcac3f0dac018c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Jun 2014 22:26:34 +0800
Tag:    v2.7.1

Merge branch 'wip-mdl-45641-m27' of https://github.com/rajeshtaneja/moodle into MOODLE_27_STABLE

commit f74b3cd8bcbc982bac7a51cb9069a0a445647fef
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Jun 2014 22:12:30 +0800
Tag:    v2.8.0-beta

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

commit c1f759ab5045d6ea2b8e89c255ad43c94a809f87
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Jun 2014 22:09:54 +0800
Tag:    v2.6.4

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

commit 8dd0756226fe133ae304a70f0580a353429f78dd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Jun 2014 22:09:53 +0800
Tag:    v2.7.1

Merge branch 'MDL-42467_database_27' of https://github.com/andyjdavis/moodle into MOODLE_27_STABLE

commit 9d8c36392786898cf03814e2bd2fdda15bb5d283
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Jun 2014 22:08:59 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-42467_database' of https://github.com/andyjdavis/moodle

commit d183fbaf60dbca74fdbbd572ee2294e1f56a1a37
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Jun 2014 20:27:18 +0800
Tag:    v2.6.4

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

commit 8458e3d2c2b0b16b2b4f13d6dc54b1f4385d6642
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Jun 2014 20:27:16 +0800
Tag:    v2.7.1

Merge branch 'MDL-45833_27' of git://github.com/dmonllao/moodle into MOODLE_27_STABLE

commit 973508d2e574219f1b59afb20f54fd9ad6d15846
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Jun 2014 20:27:14 +0800
Tag:    v2.8.0-beta

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

commit 0d0552d430fe3bb7e4c8bce4d900d795c23facb7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Jun 2014 18:45:32 +0800
Tag:    v2.6.4

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

commit 951a64f6ef59bb2305bc548ac09335ff79db1ec1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Jun 2014 18:45:29 +0800
Tag:    v2.7.1

Merge branch 'MDL-46044-27' of git://github.com/damyon/moodle into MOODLE_27_STABLE

commit edd605d913968897ece4337ab297dc5a6c0277e4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Jun 2014 18:45:29 +0800
Tag:    v2.8.0-beta

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

commit 6f90b157f37e19883179122b33b33273dbd5bf70
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Jun 2014 16:24:39 +0800
Tag:    v2.8.0-beta

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

commit f50f41c5072cc0b35a528d8696e29b6873e223a5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Jun 2014 15:56:47 +0800
Tag:    v2.6.4

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

commit b6ac868d71df7f6350932aa005e383dfda29e85d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Jun 2014 15:55:39 +0800
Tag:    v2.7.1

Merge branch 'MDL-40228-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit cb1bf3f51ae21a01fc40d52c9dbf31c42e8b87bc
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Jun 2014 15:55:35 +0800
Tag:    v2.8.0-beta

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

commit 7c3e7cdae97ad12fa3433bd46baf2dac6c5efc41
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Jun 2014 22:26:03 +0800
Tag:    v2.6.4

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

commit 845512407082348b650e550315334b789694df66
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Jun 2014 22:26:01 +0800
Tag:    v2.7.1

Merge branch '45333-27' of git://github.com/samhemelryk/moodle into MOODLE_27_STABLE

commit 1051166f78507981300623ee69f315f9f3d19112
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Jun 2014 22:25:59 +0800
Tag:    v2.8.0-beta

Merge branch '45333-28' of git://github.com/samhemelryk/moodle

commit ed3f8591ed8b6a69169d2830d18d88884327a958
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Jun 2014 22:19:22 +0800
Tag:    v2.8.0-beta

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

commit 0eb40618ba9a105d216f47d934c34b27d1b3e8b7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Jun 2014 19:58:34 +0800
Tag:    v2.8.0-beta

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

commit 09da421d929a7ebb6a5ee592f9df6dfdfb3fb5c4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Jun 2014 19:20:41 +0800
Tag:    v2.8.0-beta

Merge branch '45513-28-defines' of git://github.com/samhemelryk/moodle

commit 56f23662b129d6e3fb9493a9eebcfb57b5b1d565
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 May 2014 14:50:03 +0800
Tag:    v2.6.4

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

commit a64528d88cd873fc746d1f555a5ce73aa18bc62f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 May 2014 14:49:58 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-45544-master' of git://github.com/lameze/moodle

commit c5549ab4757b13bd0d9780e4b429d74e0c78fda5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 May 2014 19:02:43 +0800
Tag:    v2.6.4

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

commit ad7d8edf0cedf2e8126c68968e45a0f443563a1f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 May 2014 19:02:41 +0800
Tag:    v2.7.1

Merge branch 'MDL-45676_m27' of https://github.com/markn86/moodle into MOODLE_27_STABLE

commit 1ce76b900ba58c3ad3318eaa20ea1df1f63f60ee
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 May 2014 19:02:40 +0800
Tag:    v2.8.0-beta

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

commit 1ec46dca1dff091e1959ac6d0b5bb028641ce2d6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 May 2014 18:59:26 +0800
Tag:    v2.6.4

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

commit 9f4a69a8cda1af055092f59218484c4be1e1b313
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 May 2014 18:58:57 +0800
Tag:    v2.7.1

Merge branch 'MDL-45675_m27' of https://github.com/markn86/moodle into MOODLE_27_STABLE

commit c6e3d679343321e93db7229dce01d9d8b0fca26e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 May 2014 18:58:50 +0800
Tag:    v2.8.0-beta

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

commit 6ca4f19a9f55c45897424796f49de35de606331a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 May 2014 18:23:59 +0800
Tag:    v2.8.0-beta

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

commit 7d5774aaa290bddde9dc9f3405fe54c203b51349
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 May 2014 10:03:09 +0800
Tag:    v2.6.4

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

commit 627a4619f5687d544304b25df34b14d3b4a7e5c1
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 May 2014 10:03:05 +0800
Tag:    v2.8.0-beta

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

commit aadf64b7f64a68155e5e19474518d8e935619c18
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 20:34:10 +0800
Tag:    v2.5.7

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

commit be38640dfa872814677e18cf024b8c84f755ae60
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 20:32:14 +0800
Tag:    v2.8.0-beta

Merge branch '44711-28-r2' of git://github.com/samhemelryk/moodle

commit 7d5e56cffdbced6ed664007533eedb21aa9abfe6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 20:32:10 +0800
Tag:    v2.7.1

Merge branch '44711-27-r2' of git://github.com/samhemelryk/moodle into MOODLE_27_STABLE

commit 239db05eecb04fd3d2657a6b35550b4759a42d65
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 20:32:02 +0800
Tag:    v2.6.4

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

commit d4a84d8f0caf8b5ae54cb6ca13349a55f8269573
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 15:55:14 +0800
Tag:    v2.5.7

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

commit af8bd4de8ec3e7e72c0d7ddaf70dd4f1c7eccb12
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 15:55:13 +0800
Tag:    v2.6.4

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

commit 46021b98b2f61a714d6a647d69c829f9f48efa66
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 15:55:12 +0800
Tag:    v2.7.1

Merge branch 'MDL-45496-m27' of https://github.com/micaherne/moodle into MOODLE_27_STABLE

commit 2eb4176242b1900125ff7206dfd319dda4d40039
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 15:54:25 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-45496-m' of https://github.com/micaherne/moodle

commit 55739cdfb61c2a65635a90a267a7899ed64b6188
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 15:50:29 +0800
Tag:    v2.7.1

Merge branch 'MDL-45563-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit 287a42e49a1749f4baa968ecb34180b0536bbff5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 14:06:42 +0800
Tag:    v2.8.0-beta

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

commit b9c49aefb25a01907d60cabae9536d00536914a4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 13:23:40 +0800
Tag:    v2.7.1

Merge branch 'MDL-45501-27' of git://github.com/ankitagarwal/moodle into MOODLE_27_STABLE

commit 959599a9297c2a82a4d8b7361c07d3a63bee8092
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 13:23:35 +0800
Tag:    v2.8.0-beta

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

commit 60f8e19ce1cc21ab2aaf12d7993671964bffce4f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 13:17:41 +0800
Tag:    v2.7.1

Merge branch 'MDL-45566-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit 9ace4d026e7fa3c0304e2a0b9cd4de06180da8a6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 12:21:59 +0800
Tag:    v2.5.7

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

commit 67f6ebacff088032a06fc98b31190c5c701b66ec
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 12:21:58 +0800
Tag:    v2.6.4

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

commit 106be68e829c80fa8894cd9439b3ebf57c3a6b41
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 12:21:12 +0800
Tag:    v2.7.1

Merge branch 'MDL-45545-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit c51ad7cbe20c3492463575209f1428fb56067e5c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 11:51:53 +0800
Tag:    v2.8.0-beta

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

commit a06c905d0717ed7253156a7c95d846cb4dc22fb6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 10:51:32 +0800
Tag:    v2.5.7

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

commit 2b0ea3051d527a50cadac9a8c22dbad656dc5866
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 10:51:27 +0800
Tag:    v2.6.4

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

commit 3bd9c97774a9f2ff4f6f79d471595f56566003ea
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 10:51:16 +0800
Tag:    v2.8.0-beta

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

commit c6e7b00ca5637e45c5b83f4c7670d9b8d6ad0577
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 10:24:46 +0800
Tag:    v2.5.7

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

commit 1910d01a86da7d6101f5f763cf35acc121ed3a4f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 10:24:42 +0800
Tag:    v2.7.1

Merge branch 'MDL-45546-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit fa496d3fe18edd38d2fd8d220f6da10b8cb2c68f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 10:24:40 +0800
Tag:    v2.6.4

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

commit 06a689b76116cdc45cb39f612b7ded49eefc5f15
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 10:15:11 +0800
Tag:    v2.8.0-beta

Merge branch '44711-28' of git://github.com/samhemelryk/moodle

commit 4fbc0fcb1dd2a746cc483201d8d166f81060bc79
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 10:14:30 +0800
Tag:    v2.5.7

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

commit fa4ff1bd104d68dd4ac304c213d25e450d0e2928
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 10:14:24 +0800
Tag:    v2.6.4

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

commit c9c530fd6ea7054d984783f03ac0afd97eddd4a3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 10:14:22 +0800
Tag:    v2.7.1

Merge branch '44711-27' of git://github.com/samhemelryk/moodle into MOODLE_27_STABLE

commit 1151c25eda6e49e9ea10dd7423a2e29eabd3fc3e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 09:50:55 +0800
Tag:    v2.5.7

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

commit 940269660f339bb491d18e6dd367544c009d5b61
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 09:50:51 +0800
Tag:    v2.6.4

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

commit 0c722830d9a4c38bf6db600967b4b9f717e7fc00
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 09:50:43 +0800
Tag:    v2.8.0-beta

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

commit 8afd9fd8867728bfedcb0c22879041aab4278fdb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 09:47:54 +0800
Tag:    v2.5.7

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

commit 9813e71861ca678e26f48add87387aa169f7d7e3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 09:46:39 +0800
Tag:    v2.5.7

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

commit 8d8a5e80350dc5e912f20c033dc6dee0124d57ef
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 09:30:19 +0800
Tag:    v2.7.1

Merge branch 'MDL-45550-m27' of https://github.com/sammarshallou/moodle into MOODLE_27_STABLE

commit 93b9ded2dec82b62a63002fff6a38f02e6d07ff4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 09:30:19 +0800
Tag:    v2.8.0-beta

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

commit ce400f61e672574636f07a7f851a6832d370e143
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 May 2014 18:43:17 +0800
Tag:    v2.6.4

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

commit c1e3f9924937895790b78e7c078b81a757c99502
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 May 2014 18:43:15 +0800
Tag:    v2.8.0-beta

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

commit 2fa8db79cc68e45f5e884e04eaeccfd8cfd4e51b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 May 2014 15:07:53 +0800
Tag:    v2.6.4

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

commit 18b12e7b6067c065308ca2fd8579af87e1141921
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 May 2014 15:07:36 +0800
Tag:    v2.8.0-beta

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

commit 1ad0beaf4fa956da7942d1822c1bf60767a1fcba
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 May 2014 14:59:36 +0800
Tag:    v2.6.4

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

commit 228fc821e0a78440d443f767976b1d8ab163b16e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 May 2014 14:58:51 +0800
Tag:    v2.7.1

Merge branch 'wip-MDL-34914-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE

commit 457bc317158e1ec91c75bbca9c80ccc287658dee
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 May 2014 14:58:49 +0800
Tag:    v2.8.0-beta

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

commit 11b39253d2668b04163c87f07deacf394731c380
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 May 2014 14:46:55 +0800
Tag:    v2.7.1

Merge branch 'MDL-45523_m27' of https://github.com/merrill-oakland/moodle into MOODLE_27_STABLE

commit 56e84a798546187fb768ba642ab05c40c09da5b6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 May 2014 14:37:23 +0800
Tag:    v2.7.1

Merge branch 'MDL-45522_m27' of https://github.com/merrill-oakland/moodle into MOODLE_27_STABLE

commit a5fd1a13c8270b636b79a1c864c653205ae5e114
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 09 May 2014 10:50:26 +0800
Tag:    v2.7.0

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

commit d1a316373f2f4cb23384d1181782197f2b70a081
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 08 May 2014 11:05:20 +0800
Tag:    v2.7.0-rc2

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

commit 7ff7ebef40061d2771bbf6f38907eabc03904eb7
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 08 May 2014 10:51:59 +0800
Tag:    v2.5.6

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

commit a9d14d2a3628c11c9d9a2f0a1ccea4700300770a
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 08 May 2014 10:51:53 +0800
Tag:    v2.6.3

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

commit dac2e286da07b61c9ee64519c57e6796b6ce9c7f
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 08 May 2014 10:51:51 +0800
Tag:    v2.7.0-rc2

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

commit 917ceadbd797317a22972285dd1a7edf5ba7c342
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 May 2014 17:51:31 +0800
Tag:    v2.7.0-rc2

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

commit 8adc7c37c550d657076d618981d220bfde73a950
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 May 2014 16:40:46 +0800
Tag:    v2.5.6

Merge branch 'MDL-45410-en_fix-25' of git://github.com/mudrd8mz/moodle into MOODLE_25_STABLE

commit 20b65746e37ef1afd62dbf0afae5d01d59bcb7bd
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 May 2014 16:40:42 +0800
Tag:    v2.6.3

Merge branch 'MDL-45410-en_fix-26' of git://github.com/mudrd8mz/moodle into MOODLE_26_STABLE

commit fb3f578f41bbcd20685694b4567d48e10ec5cb33
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 May 2014 16:38:00 +0800
Tag:    v2.7.0-rc2

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

commit 5140fac5da8b4c70d940636c79a9b4072328709d
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 May 2014 14:18:13 +0800
Tag:    v2.7.0-rc2

Merge branch 'MDL-44606-master' of http://github.com/damyon/moodle

commit b6cb3a43245644868fd8c78f8e58a9c436ce0de9
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 May 2014 14:16:20 +0800
Tag:    v2.7.0-rc2

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

commit c1d62ed25da0aabc62257aa6649bc35834f6f4a4
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 May 2014 12:05:43 +0800
Tag:    v2.6.3

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

commit f532c413471f7a928cdb2f9413e1db8e789f8719
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 May 2014 12:05:36 +0800
Tag:    v2.5.6

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

commit fa00be94b1ca113614a8bc8e08157e072a79294a
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 May 2014 12:05:17 +0800
Tag:    v2.7.0-rc2

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

commit 1eb784b79af964ca8cb07973e5961d7dbb6087fb
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 May 2014 11:50:15 +0800
Tag:    v2.5.6

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

commit 34d75ff1157ab11142b70b36abe74d6e427e55cb
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 May 2014 11:50:13 +0800
Tag:    v2.6.3

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

commit 4d693c3839a1722f1cd9dcb2638c400c71acd46e
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 May 2014 11:50:09 +0800
Tag:    v2.7.0-rc2

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

commit b001cabae351228e54c4d47a4b33ba1f85930357
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 May 2014 12:07:00 +0800
Tag:    v2.5.6

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

commit 02c482704bc4975bb22f33d27d240c477d2b94d5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 May 2014 11:48:38 +0800
Tag:    v2.7.0-rc2

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

commit 73c2ae4bff1898fc8452f2d8463f16413fb07fd2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 May 2014 11:34:17 +0800
Tag:    v2.7.0-rc2

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

commit 63469ab11d1b5c7cf42331eb40f8036eb6a7b1ce
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 May 2014 11:27:41 +0800
Tag:    v2.7.0-rc2

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

commit 466a121117e53879fdfeba6ff446ebd36d71a864
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 May 2014 11:17:13 +0800
Tag:    v2.5.6

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

commit e8d36cbc1a122c63ca0aee280a1f51cf8255da68
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 May 2014 11:16:40 +0800
Tag:    v2.6.3

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

commit 4644e7d067a332658e004fcc3a5cf946df887e70
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 May 2014 11:16:32 +0800
Tag:    v2.7.0-rc2

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

commit 5bf52355ea83ad786f55722591fc7cafefca119a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 May 2014 10:25:48 +0800
Tag:    v2.7.0-rc2

Merge branch 'MDL-30106' of git://github.com/jleyva/moodle

commit 9ea9d487afdddb28fcfa00086e7a4da76479644e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 May 2014 10:18:44 +0800
Tag:    v2.6.3

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

commit ba60c472652a530351be5dfeda8e9355637eee40
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 May 2014 10:18:44 +0800
Tag:    v2.7.0-rc2

Merge branch 'MDL-42956-master' of git://github.com/lameze/moodle

commit 30453f2bc888e59aee15441f274d777affa52c1b
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 02 May 2014 17:45:41 +0800
Tag:    v2.6.3

Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE

commit b12749ee0e48628464de5dd386492c3281648b4a
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 02 May 2014 17:44:12 +0800
Tag:    v2.5.6

Merge branch 'install_25_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_25_STABLE

commit 94d5dc0b984b3eec686d396566f34e2e3342f620
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 02 May 2014 17:41:51 +0800
Tag:    v2.7.0-rc1

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

commit f25e8c41333c0ae5f59401315a98098f79240f91
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 02 May 2014 14:59:25 +0800
Tag:    v2.7.0-rc1

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

commit 39f332972b5931cc7db1ba9ae1aff8b83c7f0290
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 02 May 2014 10:59:29 +0800
Tag:    v2.7.0-rc1

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

commit eb72c1ff05dc726ae46bc5c96d8093a380c9a280
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 02 May 2014 09:44:49 +0800
Tag:    v2.7.0-rc1

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

commit bff7fab3424c11b9e8ca5f890ffa236b6a0924fd
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 01 May 2014 16:34:21 +0800
Tag:    v2.7.0-rc1

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

commit e8839b4184bdc2889016ea31851be9a91f600545
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 01 May 2014 14:52:09 +0800
Tag:    v2.5.6

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

commit 8cc974000b9b71aa92cc78270d200681a0aa563b
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 01 May 2014 14:52:06 +0800
Tag:    v2.6.3

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

commit 066f0395a69a7d5ed7091f0167191a71807cda7f
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 01 May 2014 14:52:02 +0800
Tag:    v2.7.0-rc1

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

commit 9d39960028f1c8dfda1483f7641140fd0ada883e
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 01 May 2014 14:43:22 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-43570' of https://github.com/KristerV/moodle

commit 6a8ebfcd37ea6bde515aba05595bb961753eb5bb
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 01 May 2014 14:36:10 +0800
Tag:    v2.5.6

Merge branch 'MDL-43570-M25' of https://github.com/KristerV/moodle into MOODLE_25_STABLE

commit 47cdef3d705b5de4b40087aeee67f76e59f4167b
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 01 May 2014 14:36:06 +0800
Tag:    v2.6.3

Merge branch 'MDL-43570-M26' of https://github.com/KristerV/moodle into MOODLE_26_STABLE

commit 278d605714edd6d338a0367c57e14641421ee86f
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 01 May 2014 12:36:00 +0800
Tag:    v2.6.3

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

commit 8d863216d887a26dfb0d108f84265451706b3826
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 01 May 2014 12:06:32 +0800
Tag:    v2.7.0-rc1

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

commit 9482292af2472282891000f2e9c5d0c6735cea03
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 01 May 2014 11:53:28 +0800
Tag:    v2.7.0-rc1

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

commit 0024400788c15cf0e883a114f42a8d2dbd16b95d
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 01 May 2014 11:37:13 +0800
Tag:    v2.7.0-rc1

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

commit ddd764639f9e9e583d3896d63f9ca8b2a59f3a34
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 01 May 2014 10:41:03 +0800
Tag:    v2.5.6

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

commit 62fa6fc6d5f1c35c7d6d3c0e0ac9e2df6a8540e5
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 01 May 2014 10:40:58 +0800
Tag:    v2.6.3

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

commit c37257151bfae0c3208905ef918212accab7df66
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 01 May 2014 10:40:14 +0800
Tag:    v2.7.0-rc1

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

commit e363a0fb6a68e8783540f66daedaa89fb89fd003
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 30 Apr 2014 15:48:58 +0800
Tag:    v2.6.3

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

commit da916029ba99c1232fb1a78b979d529c25d85b66
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 30 Apr 2014 15:48:17 +0800
Tag:    v2.7.0-rc1

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

commit 2b447f7df9ae0f2cd3f017bbfda847f2f648ecde
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 30 Apr 2014 14:58:59 +0800
Tag:    v2.5.6

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

commit 63c6df66c3c736c3525ea5dc90462002f6ca1499
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 30 Apr 2014 14:58:56 +0800
Tag:    v2.7.0-rc1

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

commit 8f8f5834067a5f092a1a602d67c9af7044a069d7
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 30 Apr 2014 14:58:49 +0800
Tag:    v2.6.3

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

commit 4df8bbfc874157a2ba93ef9b916a2700eea642c6
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 30 Apr 2014 14:15:40 +0800
Tag:    v2.7.0-rc1

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

commit 4b1e2c5fc88862ea8147582c427149be9af3ff45
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 30 Apr 2014 11:25:02 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-44780_mathjax_default' of https://github.com/andyjdavis/moodle

commit 853c1d7169788d89ad32cc16cd4b18c35f197581
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Apr 2014 10:17:16 +0800
Tag:    v2.7.0-rc1

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

commit cf3166aafbd625494350d96974d646562f748685
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 Apr 2014 09:40:41 +0800
Tag:    v2.7.0-rc1

Merge branch 'w17_MDL-45250_m27_ripaddtolog' of https://github.com/skodak/moodle

commit 14f820c79b8c1a74bfa8ff17ca3c0a1d57e78c16
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 Apr 2014 14:04:38 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-42869' of https://github.com/danielneis/moodle

commit 7732473108d75fed8c58cbbe91bbe47818d869e5
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 Apr 2014 13:56:32 +0800
Tag:    v2.5.6

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

commit 1bdedfb880cd6c1185979d9ce767bc0078bb659a
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 Apr 2014 13:31:47 +0800
Tag:    v2.7.0-rc1

Merge branch 'w17_MDL-45080_m27_questioncreate' of https://github.com/skodak/moodle

commit ff17f6f8df6d784876c9d3ba95ff4e96039b8076
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 Apr 2014 13:26:49 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-44730_install' of https://github.com/andyjdavis/moodle

commit a6a488d4098fdec91b37297eedb202b72ddc4b9d
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Apr 2014 17:57:13 +0800
Tag:    v2.7.0-rc1

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

commit e679eb6c27d12a2dd64180f4d795c4f790a5c8f1
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Apr 2014 17:56:45 +0800
Tag:    v2.6.3

Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE

commit 19ce7a47d903db2f403abc3f4aff2ec09281dc28
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Apr 2014 17:56:21 +0800
Tag:    v2.5.6

Merge branch 'install_25_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_25_STABLE

commit 391726782e0388af2f00abf9b9924590565b7e85
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Apr 2014 10:01:01 +0800
Tag:    v2.5.6

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

commit 53318d684adb88e89245de549907b539ed317411
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Apr 2014 10:00:59 +0800
Tag:    v2.6.3

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

commit 5d933a6abe35ce49566594f4c1c04394315beee9
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Apr 2014 16:40:26 +0800
Tag:    v2.6.3

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

commit b24067ce0f05589af0c8ad22db90e76324ac0818
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Apr 2014 16:40:22 +0800
Tag:    v2.5.6

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

commit d7ef1ac747ca42cac4c5fdf2badf3d377a525310
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Apr 2014 16:40:22 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-45172_block' of https://github.com/andyjdavis/moodle

commit 4a85e96b97319c4108ea4d14ac1e23744fd9c268
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Apr 2014 16:18:14 +0800
Tag:    v2.6.3

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

commit 7b59af440dd6ef8f59e92bb01e71a7050e62ae1a
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Apr 2014 16:16:29 +0800
Tag:    v2.5.6

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

commit 54de59e70ac3d03002f6ae97cd8e9aef4b51409e
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Apr 2014 16:13:08 +0800
Tag:    v2.7.0-rc1

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

commit 5c500501334eb55084b23d9c43dd3a626421d6e9
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Apr 2014 14:23:22 +0800
Tag:    v2.5.6

Merge branch 'wip-MDL-45148-25' of https://github.com/mackensen/moodle into MOODLE_25_STABLE

commit e3986158bfb67fca485e599ab4cdec157c844908
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Apr 2014 14:22:21 +0800
Tag:    v2.6.3

Merge branch 'wip-MDL-45148-26' of https://github.com/mackensen/moodle into MOODLE_26_STABLE

commit f58add15b182ef35b16658dbe6806f60b04818c4
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Apr 2014 14:22:17 +0800
Tag:    v2.7.0-rc1

Merge branch 'wip-MDL-45148-master' of https://github.com/mackensen/moodle

commit 0a4fa7134556544094b4c3c43cee3f5c86a3d451
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Apr 2014 13:29:20 +0800
Tag:    v2.7.0-rc1

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

commit b7ff518b1757f44aed47e5eb5ed0280819f99e34
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Apr 2014 10:44:10 +0800
Tag:    v2.7.0-rc1

Merge branch 'w17_MDL-45203_m27_loginlog' of https://github.com/skodak/moodle

commit 98bb800209a9e100ca217e129b1f71fbd56eee2c
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Apr 2014 10:39:26 +0800
Tag:    v2.7.0-rc1

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

commit d55806ce05d8762e19779a1b681584da5df8e8fb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Apr 2014 15:18:59 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-40716-master' of https://github.com/andrewnicols/moodle

commit 040b8cd17f08a2d7a89e516c1d9ba0d590fdcbdb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Apr 2014 12:36:17 +0800
Tag:    v2.5.6

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

commit 0574e41f62c3f57862fa7246ab68b1c510779785
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Apr 2014 12:36:02 +0800
Tag:    v2.6.3

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

commit de125853dbd6116aa65ddaf3e54e28c9241d095a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Apr 2014 12:35:10 +0800
Tag:    v2.7.0-rc1

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

commit 95f7bd8c0d866f87e593b68276d5b2ba15dfca2b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Apr 2014 14:45:10 +0800
Tag:    v2.7.0-rc1

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

commit 2b77a4e58edf914974f79be0cef679ff5b8879bc
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Apr 2014 14:42:09 +0800
Tag:    v2.5.6

Merge branch 'w16_MDL-45049_m25_debugging' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 1e19ea00d862e7a8595ab186c230244aaf3a4fba
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Apr 2014 14:41:46 +0800
Tag:    v2.6.3

Merge branch 'w16_MDL-45049_m26_debugging' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit b576d3fec064f577f2101b31257a48e7a1127c02
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Apr 2014 14:41:23 +0800
Tag:    v2.7.0-rc1

Merge branch 'w16_MDL-45049_m27_debugging' of https://github.com/skodak/moodle

commit eec37952701d0f95cf599405bd5d59d93016c785
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Apr 2014 10:51:38 +0800
Tag:    v2.7.0-rc1

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

commit 085c68d959c4a53e510c13bf9ce1430779e276bc
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Apr 2014 10:12:34 +0800
Tag:    v2.7.0-rc1

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

commit c8ca0cea7712b6c2aaecaeafaeee8132b293608a
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 15:27:41 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-44468_master' of git://github.com/ds125v/moodle

commit e0b97841382050942fd738014257d8c6cc90f42e
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 15:27:41 +0800
Tag:    v2.6.3

Merge branch 'MDL-44468_26_STABLE' of git://github.com/ds125v/moodle into MOODLE_26_STABLE

commit c1985943de0c8d7230e4800c080b9d9678f7ee84
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 15:12:21 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-40716_master' of https://github.com/nadavkav/moodle

commit 7759b28bd3deb7f7ed1a8c1920c01c7dd0a98d6b
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 14:55:33 +0800
Tag:    v2.5.6

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

commit fc67885300c9c5bc29a018cae85ede87f4187aa2
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 14:55:33 +0800
Tag:    v2.6.3

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

commit 3497702ae54bad0fbf169c4754d03ca5ac2ec783
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 14:54:54 +0800
Tag:    v2.7.0-rc1

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

commit 3c9016eff178482c9866d7eb0b5a4c4d84d8ac96
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 14:16:23 +0800
Tag:    v2.7.0-rc1

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

commit d2907f5cb912bbcd76b5be697bffc4a5dddab439
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 14:07:53 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-44778_atto_border' of https://github.com/andyjdavis/moodle

commit ac13361b7719ed022862c0a42f8b2d8c33bba699
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 13:47:10 +0800
Tag:    v2.7.0-rc1

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

commit f6587171083002a81f97a6e30234fd8cd744c962
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 12:03:23 +0800
Tag:    v2.7.0-rc1

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

commit aee01173f7c0119da642dd48f77f0c6578b51684
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 11:54:48 +0800
Tag:    v2.7.0-rc1

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

commit d2b8b67a9cd3846038bf044deff56de53d4e2cc7
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 11:49:39 +0800
Tag:    v2.7.0-rc1

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

commit 3ff2fae230ce4cc64c7c36c78cf2a4c0466bba1c
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 11:42:36 +0800
Tag:    v2.7.0-rc1

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

commit 3bc5fbebc52684e9c0ebbc109872f2bbbbf9f449
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 11:10:39 +0800
Tag:    v2.7.0-rc1

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

commit 9cf90f9c77335bbc2fec1044d1720fbe4e5fb3ec
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 11:05:56 +0800
Tag:    v2.5.6

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

commit f21e920beb051b34bf25bf1fd13ac59b556a2ca1
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 10:52:48 +0800
Tag:    v2.6.3

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

commit a6d4ba1d97d9792e0f5d32994fa412b58a253f71
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 10:52:45 +0800
Tag:    v2.7.0-rc1

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

commit 8019375e128d6b66cde91afe53dd2b3638672dfb
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 10:50:07 +0800
Tag:    v2.6.3

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

commit 768a10f06638c21c2c7c9e0da878fba13c8d95b1
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 10:50:06 +0800
Tag:    v2.7.0-rc1

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

commit 3c9bd29d89e1dc526360d07537f590573686b66b
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 10:47:06 +0800
Tag:    v2.6.3

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

commit a94b4c6e5573ab1301a79c4d6a49df1c3ffb6f83
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 10:47:04 +0800
Tag:    v2.7.0-rc1

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

commit cafeac819fc745c24674a2d44e87793538c84655
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 10:32:18 +0800
Tag:    v2.6.3

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

commit 166dfd56b83b4c4e38ffdbf88e34fad929de4276
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 10:30:12 +0800
Tag:    v2.7.0-rc1

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

commit 2e6b251de282a11f33af7d54f6309dc0afd7b5b2
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 10:26:38 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-44990-master' of git://github.com/lameze/moodle

commit af80f7b4a5a59a2e8e90691cdeb91d5e846a02f8
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 10:23:45 +0800
Tag:    v2.7.0-rc1

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

commit 735347134fcaf7339c7d4e1b0b5e27e7eaa29b68
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 10:05:27 +0800
Tag:    v2.5.6

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

commit 6e674be060ec6ddd355cc942c5ee3f8d4728a6e7
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 10:05:27 +0800
Tag:    v2.6.3

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

commit b8d2340bb743811e1b55dc14cbad2ab78a8771a2
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 10:05:26 +0800
Tag:    v2.7.0-rc1

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

commit 8dafdfbe863bbc377d93bcf01714f9c472bfff38
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 09:57:23 +0800
Tag:    v2.5.6

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

commit 84cff478149b7f3f4d07835ec905e8da19d07fec
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 09:57:22 +0800
Tag:    v2.6.3

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

commit b67362cf98e5f2d4cd0635397a275c532b400a89
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 09:57:21 +0800
Tag:    v2.7.0-rc1

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

commit 63476b0f6f8f8a3b13e6a0c59e0dce392b53459b
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 17 Apr 2014 17:02:04 +0800
Tag:    v2.7.0-rc1

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

commit b2f7a0b31fe8a6810520d981a745af751119e246
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 17 Apr 2014 17:01:43 +0800
Tag:    v2.6.3

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

commit 287fc6ce68addadcb9e810db7b0801583971e192
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Apr 2014 15:21:08 +0800
Tag:    v2.7.0-rc1

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

commit 49161848961995e970a4aaf9371003ecaeb03618
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Apr 2014 15:11:27 +0800
Tag:    v2.7.0-rc1

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

commit 23d7cdaa2407b688511192c48dab7d81283dc0af
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Apr 2014 14:35:04 +0800
Tag:    v2.5.6

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

commit 8ce6a7dfd3d052c6c9f32ccde086d1bb57db7c25
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Apr 2014 14:35:01 +0800
Tag:    v2.6.3

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

commit 36b5096e5917d99c2a1393dcee2f8576d6a7318e
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Apr 2014 14:34:58 +0800
Tag:    v2.7.0-rc1

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

commit 5d3b26c3501a717ec6977da25c819ce473c4005f
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Apr 2014 13:56:41 +0800
Tag:    v2.5.6

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

commit 63a9c2522c2839d0eec0ff2f669dd14684e9a8cd
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Apr 2014 13:56:39 +0800
Tag:    v2.6.3

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

commit c312e59e7d176d00132ef980e2c5d9a040a800e0
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Apr 2014 13:56:37 +0800
Tag:    v2.7.0-rc1

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

commit 63eb19cbdf182e422dd55f0e78ac34618ca1c497
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Apr 2014 13:00:46 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-45089_chat' of https://github.com/andyjdavis/moodle

commit 9b7456b82e7437939be4d5710f36ec9c496652e3
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Apr 2014 11:39:50 +0800
Tag:    v2.6.3

Merge branch 'MDL-44295_v26' of https://github.com/scyrma/moodle into MOODLE_26_STABLE

commit 0dda3b10eab02a43d9e763eb2aee97ac864068db
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Apr 2014 11:33:14 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-44295' of https://github.com/scyrma/moodle

commit 21f2bad26c2171c6615785cc024664172c95d28e
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Apr 2014 10:30:47 +0800
Tag:    v2.7.0-rc1

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

commit f588d0efad0fb37cfbf018b35a2199cae84e0548
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Apr 2014 10:30:45 +0800
Tag:    v2.6.3

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

commit 58eea2b5000185018c6dde1aef60550f467d26ca
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Apr 2014 09:10:34 +0800
Tag:    v2.5.6

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

commit 1c5bdb54b74cfb7077ffc9404c7459ad44398f45
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Apr 2014 09:10:32 +0800
Tag:    v2.6.3

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

commit 30a3b12f88470a347f1afcbb82b3d00c58e6fc49
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Apr 2014 09:10:28 +0800
Tag:    v2.7.0-rc1

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

commit 57506eb548a1a35d709c1378d1f5accf5340d015
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Apr 2014 11:57:51 +0800
Tag:    v2.7.0-rc1

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

commit 42a907342360fb3870171b329d67e64f6baba300
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Apr 2014 11:38:01 +0800
Tag:    v2.7.0-rc1

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

commit 81ff1c75703511b8241f0b3e040805609234771b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Apr 2014 11:05:37 +0800
Tag:    v2.7.0-rc1

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

commit 72de455146c29927b12cb5c29a376ee2aa666b9e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Apr 2014 10:33:30 +0800
Tag:    v2.7.0-rc1

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

commit 8240dc0f0174a84144bb36b97c91b41128631a3e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Apr 2014 10:33:16 +0800
Tag:    v2.6.3

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

commit 812bee0f4f84331bf72935eaf205268846b32b26
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Apr 2014 10:27:09 +0800
Tag:    v2.6.3

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

commit ca4554402d3f8bc17e36f735c8b208e89b69928b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Apr 2014 10:26:06 +0800
Tag:    v2.7.0-rc1

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

commit 8939d65608ece0ccf85bf4244ff487ce12485659
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Apr 2014 15:23:18 +0800
Tag:    v2.6.3

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

commit 2c6401e3a9c080682b21de26f1bfa57f835b71b4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Apr 2014 15:22:59 +0800
Tag:    v2.7.0-rc1

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

commit c6758994255e24c8de2e9e6bdb05012f07e62c35
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Apr 2014 15:19:58 +0800
Tag:    v2.7.0-rc1

Merge branch 'w16_MDL-44366_m27_filtergloss' of https://github.com/skodak/moodle

commit 28770140ed773dd29dbc91725a16c1fd2a686051
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Apr 2014 12:23:57 +0800
Tag:    v2.7.0-rc1

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

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

Merge branch 'w16_MDL-44366_m27_filtergloss' of https://github.com/skodak/moodle

commit 64b88aa9487e011b04af2279093d6f1c7be2bca6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Apr 2014 10:02:01 +0800
Tag:    v2.5.6

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

commit 951ba5e8a6e4a9fd3e7c54a186c9dfa995411471
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Apr 2014 10:02:01 +0800
Tag:    v2.6.3

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

commit 8f6b4739de7b0a674d5ae1864637b8e0829613c3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Apr 2014 10:01:11 +0800
Tag:    v2.7.0-rc1

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

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 a219c38b13db41b0934897fe4ba7e14afc5ac5a0
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 11 Apr 2014 11:40:06 +0800
Tag:    v2.6.3

Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE

commit f4f0dbed33d55e0474f5feeba5b0e5ed4e7e09dd
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 11 Apr 2014 11:40:00 +0800
Tag:    v2.5.6

Merge branch 'install_25_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_25_STABLE

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 b54edd00e24bd0794845e3ca7dd4eba5a71fd070
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Apr 2014 11:41:26 +0800
Tag:    v2.6.3

Merge branch 'MDL-29572_moodle26' of https://github.com/jrchamp/moodle into MOODLE_26_STABLE

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 8cb19a633b1d7261ac2beaa5b4e22d0ed821e43e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Apr 2014 09:22:21 +0800
Tag:    v2.6.3

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

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 19fd2cbb0209716c0e8f1768f3e19addbd7aabc0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Apr 2014 13:10:42 +0800
Tag:    v2.5.6

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

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 80787633cc4538cf353a80a81e8bbf05e8c9526b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Apr 2014 13:10:41 +0800
Tag:    v2.6.3

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

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 683c7ee245100206b468b42b2ca7359aa15e3bcb
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 26 Mar 2014 05:17:55 +0800
Tag:    v2.6.3

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

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 8a9b350182c131f6c84fded5654fdde6d8c0ab95
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 12 Mar 2014 09:32:51 +0800
Tag:    v2.6.3

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

commit 584c7d3da7960ea131716a15fa1a829c1387deaa
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 12 Mar 2014 09:09:19 +0800
Tag:    v2.5.6

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

commit 2fabb89456b6811e5937fdad6e5eab5575ae2685
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 12 Mar 2014 09:08:52 +0800
Tag:    v2.6.3

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

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 1c57cd34e6bda116716267c1345ab2643ddcb384
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Mar 2014 15:50:42 +0800
Tag:    v2.6.3

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

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 46e5012aa71fb86cb76fc4b74dccd6f52866c15d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Mar 2014 15:41:54 +0800
Tag:    v2.5.6

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

commit ab9986bf05f44844f2f10571b8609cdc50eb9180
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Mar 2014 15:41:51 +0800
Tag:    v2.6.3

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

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 a808f245367225a0c657b1c27fc9d02b8524daac
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Mar 2014 14:35:40 +0800
Tag:    v2.6.3

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

commit d3561684328c3e11786c52ad99264de32dd7da59
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Mar 2014 14:33:22 +0800
Tag:    v2.5.6

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

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 549f507e78ab5612b7ea1d0762871b645bed66ca
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Mar 2014 11:37:50 +0800
Tag:    v2.5.6

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

commit 666af83e4ec497e33be520a09c30942dc0416624
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Mar 2014 11:37:45 +0800
Tag:    v2.6.3

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

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 af80706515ddb938ea0c39cac79dbc387591c164
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Mar 2014 11:29:00 +0800
Tag:    v2.6.3

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

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 f9835ffed030118cc1349f7bb8894ae06f29a3a0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Mar 2014 13:45:27 +0800
Tag:    v2.6.3

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

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 57ce177561d99c476a9a9fbba8050ecee21f1157
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Mar 2014 12:04:17 +0800
Tag:    v2.5.6

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

commit aacc48a7e67dce3dca169aefc369c9e4ad616531
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Mar 2014 12:04:16 +0800
Tag:    v2.6.3

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

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 MOOD