Git merges in Moodle x.x.x by Marina Glancy

commit 293f1b4d85d5a9b4b22b8e37eb2283f9a0b04157
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 07 Nov 2014 15:03:32 +0800
Tag:    v2.8.0-rc2

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

commit 2f1d0ea6639d8b66fcc4bebb2c712671fe3f2330
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 07 Nov 2014 11:54:13 +0800
Tag:    v2.8.0-rc2

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

commit f2db391f590717ae0fe46825062a8db1e83021d8
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 06 Nov 2014 15:14:05 +0800
Tag:    v2.8.0-rc2

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

commit 8e799494e96776483429ea7d08b1aaabc5ff405b
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 06 Nov 2014 11:42:39 +0800
Tag:    v2.6.6

Merge branch 'wip_MDL-48083_m26_rollback' of git://github.com/skodak/moodle into MOODLE_26_STABLE

commit 3925a3e287aca43544be6a484a813046d06f10f2
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 06 Nov 2014 11:42:23 +0800
Tag:    v2.7.3

Merge branch 'wip_MDL-48083_m27_rollback' of git://github.com/skodak/moodle into MOODLE_27_STABLE

commit 253b93f720141475f78dc18b0e2346733c277a9d
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 06 Nov 2014 11:42:10 +0800
Tag:    v2.8.0-rc2

Merge branch 'wip_MDL-48083_m28_rollback' of git://github.com/skodak/moodle

commit 93a4f8b5fc424162cd1284dac99e14e3045fac4a
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 05 Nov 2014 16:35:05 +0800
Tag:    v2.8.0-rc2

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

commit 1d9155872fce6cf10e66cdf68b1a9c316483a60f
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 04 Nov 2014 10:47:09 +0800
Tag:    v2.8.0-rc1

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

commit 8bd6b270b237d1e44512dd1c7201e1b96246673b
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Nov 2014 17:21:55 +0800
Tag:    v2.8.0-rc1

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

commit 818a6ef982a5124915d0b0831311a450f2a315e6
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Nov 2014 17:05:26 +0800
Tag:    v2.6.6

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

commit 2cb907d11d5f1c7ebc5abd5901ebc0d01da04b83
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Nov 2014 17:04:20 +0800
Tag:    v2.7.3

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

commit d9fb78c9810311c32ff26d76969365d850207c15
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Nov 2014 17:03:57 +0800
Tag:    v2.8.0-rc1

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

commit dc8a9a1b83619e7583e6f2ea7774e211b7bb0fa4
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 30 Oct 2014 17:15:59 +0800
Tag:    v2.6.6

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

commit 7892e8dd6ad5630ba7a5d094293de1011450d8e2
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 30 Oct 2014 17:14:42 +0800
Tag:    v2.7.3

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

commit 08674d83c143c8aa6a916c547ab7c6a59d98410f
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 30 Oct 2014 17:14:09 +0800
Tag:    v2.8.0-rc1

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

commit 5023b2e9d81041531fe590cc7d38e5f7bc53a64b
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 30 Oct 2014 16:17:06 +0800
Tag:    v2.6.6

Merge branch 'MDL-47569_CC_Errors26' of git://github.com/moodlerooms/moodle into MOODLE_26_STABLE

commit 015934fd018a506f1da620d2364886228c58b317
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 30 Oct 2014 16:16:59 +0800
Tag:    v2.6.6

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

commit 6d5a4e733ba444d80a08fdd64e9c97cf4bbb671f
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 30 Oct 2014 16:16:32 +0800
Tag:    v2.7.3

Merge branch 'MDL-47569_CC_Errors27' of git://github.com/moodlerooms/moodle into MOODLE_27_STABLE

commit eccad2d4bc86dfe3a57a130ad920f3081180ffa2
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 30 Oct 2014 16:16:23 +0800
Tag:    v2.7.3

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

commit 89da9fa67b28fe21565888721b18c544e95359dc
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 30 Oct 2014 16:15:51 +0800
Tag:    v2.8.0-rc1

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

commit 61138e352d7ab0a97b96d8d4e632e2d8639b5b08
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 30 Oct 2014 16:15:38 +0800
Tag:    v2.8.0-rc1

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

commit 9e432c22cd862960cc4dc258e09fbb78eaffbd64
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 30 Oct 2014 16:15:10 +0800
Tag:    v2.8.0-rc1

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

commit f1d3d8ccb315282cb984e6ef120d4304efc0eff2
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 30 Oct 2014 14:22:48 +0800
Tag:    v2.8.0-rc1

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

commit 3dc7afc186bdeb0a719adbb5e121a0cce8aa79d0
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 30 Oct 2014 14:19:52 +0800
Tag:    v2.8.0-rc1

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

commit 9ca5b7d84541c76a714e1014204102573f6cfbdc
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 30 Oct 2014 14:18:07 +0800
Tag:    v2.6.6

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

commit 0081072ff1017c1556d0fac07b62df3e80254d48
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 30 Oct 2014 14:17:55 +0800
Tag:    v2.7.3

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

commit 2f28c711861e51a079d99eeb8f24051843fcbee3
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 30 Oct 2014 14:17:32 +0800
Tag:    v2.8.0-rc1

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

commit b33d63351069a5c9a8a9f588751ab139117e00e0
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 29 Oct 2014 16:15:32 +0800
Tag:    v2.7.3

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

commit 72dbe74e7e9096353309a5ba38490b27639d6000
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 29 Oct 2014 16:15:07 +0800
Tag:    v2.8.0-rc1

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

commit b5478757c61f4edb48bcd4da994db8ec7ed7d58a
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 28 Oct 2014 17:55:06 +0800
Tag:    v2.8.0-rc1

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

commit 001652d74317e9fa25ebecef3fecc3061df4dcf5
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 28 Oct 2014 17:26:57 +0800
Tag:    v2.8.0-rc1

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

commit 45b7a397bb020738cd478b684ffdb725003c510b
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 28 Oct 2014 15:37:05 +0800
Tag:    v2.8.0-rc1

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

commit 6ef51ef5aafb839f408f74990de7278e396ef6e7
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 28 Oct 2014 12:24:24 +0800
Tag:    v2.6.6

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

commit 63f1e3b2879d22197edf2abb016ded0556ee8081
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 28 Oct 2014 12:24:01 +0800
Tag:    v2.7.3

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

commit 7d79115f3df595c62649abaafb625f0b9a8e1062
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 28 Oct 2014 12:23:33 +0800
Tag:    v2.8.0-rc1

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

commit f173ae201494f2f91bdc646655945b1f5dca6726
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 28 Oct 2014 12:23:23 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-814-master' of git://github.com/danpoltawski/moodle

commit f2bec5d9bad6710fb36277377427e43683ad293c
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 27 Oct 2014 11:52:35 +0800
Tag:    v2.8.0-rc1

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

commit a8668e161a706be6f687efe4de07edfc6063c4a0
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 27 Oct 2014 11:52:18 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-47882_scorm_loadsco_invalid_html' of git://github.com/MorrisR2/moodle

commit 66f6a6ff307de4fcd4ae38af1b9f5aa57d5efa50
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 27 Oct 2014 11:49:48 +0800
Tag:    v2.6.6

Merge branch 'MDL-47882_scorm_loadsco_invalid_html_26_STABLE' of git://github.com/MorrisR2/moodle into MOODLE_26_STABLE

commit 7047ebb7a32559c226978f7d9b70be21c29e612f
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 27 Oct 2014 11:49:01 +0800
Tag:    v2.7.3

Merge branch 'MDL-47882_scorm_loadsco_invalid_html_27_STABLE' of git://github.com/MorrisR2/moodle into MOODLE_27_STABLE

commit 4ea3258af9eae83497b105725a7aa41af2c93612
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 24 Oct 2014 16:22:12 +0800
Tag:    v2.8.0-rc1

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

commit 681276aad232869a3068570ecd42ff7dcb80fae2
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 24 Oct 2014 15:18:16 +0800
Tag:    v2.8.0-rc1

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

commit 81e20e147743382ca420d9e448cf225765479866
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 24 Oct 2014 11:55:42 +0800
Tag:    v2.6.6

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

commit 779d68eb8a31a607e635c0288c81aa71ec078749
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 24 Oct 2014 11:55:16 +0800
Tag:    v2.7.3

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

commit c785cc98931528b5abf4b5aa6bf8cbdf963e76c7
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 24 Oct 2014 11:54:42 +0800
Tag:    v2.8.0-rc1

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

commit 2a9bc5909d3279b87885f230c7d0ef682e9277f1
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 23 Oct 2014 17:16:44 +0800
Tag:    v2.8.0-rc1

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

commit 36594faebb3726bf8bfbddd0373d8f750252efdb
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 23 Oct 2014 17:16:44 +0800
Tag:    v2.8.0-rc1

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

commit bb030ebc2af5073d4c2b4a4e56c92009f089dec9
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 23 Oct 2014 17:09:32 +0800
Tag:    v2.8.0-rc1

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

commit aeeccb1697795e25fdd61941a0e16dd3b7194a6d
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 23 Oct 2014 17:09:32 +0800
Tag:    v2.8.0-rc1

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

commit fd0713b18b6636ab1dbdded4c45282ef91f90f3e
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 23 Oct 2014 16:58:34 +0800
Tag:    v2.6.6

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

commit eefedf7a06fdefa901cc4aaa635de6ae9518ce52
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 23 Oct 2014 16:58:13 +0800
Tag:    v2.7.3

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

commit c3b545a92afaa34c836212f42441623cdd171670
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 23 Oct 2014 16:57:56 +0800
Tag:    v2.8.0-rc1

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

commit d129a0ffe91da11f4f8c5b27f5837e8531fd5394
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 23 Oct 2014 16:57:56 +0800
Tag:    v2.8.0-rc1

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

commit 13c9e9c0431e699f82abecf4e7ff529038fd0019
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 23 Oct 2014 16:35:59 +0800
Tag:    v2.8.0-rc1

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

commit d3312bb6ac653483fbcb6325860e28e60f7a075f
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 23 Oct 2014 16:35:59 +0800
Tag:    v2.8.0-rc1

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

commit 3824556c9abcd3bdba97df14ca1ee0a75c9e5791
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 23 Oct 2014 15:45:54 +0800
Tag:    v2.8.0-rc1

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

commit 05599c47cb1c94a8ce3352e9fafb5565fc930c2c
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 23 Oct 2014 15:45:54 +0800
Tag:    v2.8.0-rc1

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

commit 65504187d87b934916d0cee20b730d89e731aa2d
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 23 Oct 2014 15:42:46 +0800
Tag:    v2.8.0-rc1

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

commit 41d58f6f4c197d9c6b89854d174c7f4d3f18a051
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 23 Oct 2014 15:42:46 +0800
Tag:    v2.8.0-rc1

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

commit 1e3dc6ed9cd39a822c2f74092ad79efb74afac2c
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 23 Oct 2014 15:23:52 +0800
Tag:    v2.8.0-rc1

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

commit 653f6c23cb3d6791c226a138c8ee6b903b1525b1
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 23 Oct 2014 15:23:52 +0800
Tag:    v2.8.0-rc1

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

commit b7840d478357edfe6946a1752f3ae2d856d03430
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 23 Oct 2014 15:21:28 +0800
Tag:    v2.8.0-rc1

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

commit 18ebeed5e90168fcee29b23552733cfc197e188a
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 23 Oct 2014 15:21:28 +0800
Tag:    v2.8.0-rc1

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

commit b1b66a3d1213e31392f81ba9821a55b84ccc335c
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 21 Oct 2014 15:49:10 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-47736_master_fix2' of git://github.com/markn86/moodle

commit fb32a64efcf449bf7d7bc5725c243b09ecd3d43e
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 21 Oct 2014 14:34:05 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-47736_master_fix' of git://github.com/markn86/moodle

commit e94925ddd29d9654fbea98a9284b5ef8d5a1c9b3
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 21 Oct 2014 11:56:31 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-47728_master' of git://github.com/markn86/moodle

commit 8b2d85406a7c61ef84065cba6c106b78a87a56db
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 21 Oct 2014 10:55:54 +0800
Tag:    v2.8.0-rc1

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

commit 2d2661e3d7bb35a14968331eac22f7a4dddf0b60
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 20 Oct 2014 17:08:20 +0800
Tag:    v2.8.0-rc1

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

commit 6f0276ceaf3d91a41c3ea2686878bb4cac9fd472
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 20 Oct 2014 17:04:54 +0800
Tag:    v2.6.6

Merge branch 'wip_MDL-47754_m26_installredir' of git://github.com/skodak/moodle into MOODLE_26_STABLE

commit d8a7d44a653b5d26b6a0f4cec6a11ce027b8400b
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 20 Oct 2014 17:04:42 +0800
Tag:    v2.7.3

Merge branch 'wip_MDL-47754_m27_installredir' of git://github.com/skodak/moodle into MOODLE_27_STABLE

commit 24c11785b3d9688a680b8868a9e344470d7e70c2
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 20 Oct 2014 17:02:28 +0800
Tag:    v2.8.0-rc1

Merge branch 'wip_MDL-47754_m28_installredir' of git://github.com/skodak/moodle

commit f75f2ecdf4ad2875c8371889601b715d3d3e3e91
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 20 Oct 2014 15:19:57 +0800
Tag:    v2.8.0-rc1

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

commit d90f0cab6d04bf0512038a2732e9d797851db22d
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 20 Oct 2014 15:06:43 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-47736_master' of git://github.com/markn86/moodle

commit 1d67a8f209909568b5560548cc42df0f38a7abbe
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 20 Oct 2014 15:06:29 +0800
Tag:    v2.8.0-rc1

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

commit be54fc0412df5f51d1c1b2f104207eb897d69420
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 20 Oct 2014 14:09:02 +0800
Tag:    v2.6.6

Merge branch 'MDL-38065-fix-26' of git://github.com/jmarthaler/moodle into MOODLE_26_STABLE

commit 97f240e7b6402d3ba1bff936b726bbdeb3fd14aa
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 20 Oct 2014 14:08:34 +0800
Tag:    v2.7.3

Merge branch 'MDL-38065-fix-27' of git://github.com/jmarthaler/moodle into MOODLE_27_STABLE

commit b3729c99aa54cda61acb0737549e379bb52d6a3a
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 20 Oct 2014 14:08:06 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-38065-fix-master' of git://github.com/jmarthaler/moodle

commit c57681ed496baa808958db8d0570b78104b3b063
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 20 Oct 2014 12:43:52 +0800
Tag:    v2.8.0-rc1

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

commit acab649e068812808392c43a8043baf6d5ab0830
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 14 Oct 2014 18:34:14 +0800
Tag:    v2.8.0-rc1

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

commit a3514938465a964133e7de6e0a49212395e0d3c6
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 08 Oct 2014 19:58:43 +0800
Tag:    v2.8.0-beta

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

commit 850ac50a87333c73b124c5c4a3cd76740cb37ee5
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 07 Oct 2014 17:16:56 +0800
Tag:    v2.8.0-beta

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

commit 5f0def5568a43f07b10124c63dc0a21685e6a20c
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 07 Oct 2014 17:16:11 +0800
Tag:    v2.6.6

Merge branch 'MDL-31936-26-workshop-reset' of git://github.com/mudrd8mz/moodle into MOODLE_26_STABLE

commit 8dfd73e04a875b80087dac786f90767ecd049e8b
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 07 Oct 2014 10:25:29 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-38106-master' of git://github.com/danpoltawski/moodle

commit 5104bb8a2419598b8626debdb5f023946e30083a
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 07 Oct 2014 10:10:33 +0800
Tag:    v2.6.6

Merge branch 'MDL-31936-26-workshop-reset' of git://github.com/mudrd8mz/moodle into MOODLE_26_STABLE

commit 58f87868d0b0928ed7a00a41ff7a8ba578374ed6
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 07 Oct 2014 10:10:06 +0800
Tag:    v2.7.3

Merge branch 'MDL-31936-27-workshop-reset' of git://github.com/mudrd8mz/moodle into MOODLE_27_STABLE

commit ae66542027682dc2b01e176e929e478c89d6bad7
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 07 Oct 2014 10:08:48 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-31936-master-workshop-reset' of git://github.com/mudrd8mz/moodle

commit b79d2e2c08e997bbb824907357333cc32fd760c9
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 06 Oct 2014 20:40:13 +0800
Tag:    v2.8.0-beta

Merge branch 'wip_MDL-47538_m28_phpunitseq' of git://github.com/skodak/moodle

commit 2891651959379a36eb34d8fa1bab757a7bdd9864
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 06 Oct 2014 20:39:09 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46210-master' of git://github.com/danpoltawski/moodle

commit e2861853348c145d6507604f6e1aa550e4e9eead
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 06 Oct 2014 20:38:29 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-47221-master' of git://github.com/danpoltawski/moodle

commit 4525ff2cfbed3e5749292f48d9ca95e69d86e608
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Sep 2014 10:50:06 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46818-master-fixup' of https://github.com/FMCorz/moodle

commit 88fc9ca21af516a0c24e24cdacdfcde09b5c6d4b
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Sep 2014 17:19:02 +0800
Tag:    v2.6.6

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

commit 0a70f84dde8ec182266a7f4d5a161f6913d27ab0
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Sep 2014 17:18:53 +0800
Tag:    v2.7.3

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

commit a788aade7ce694b3f36c8e27295c60a5178c5b23
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Sep 2014 17:18:42 +0800
Tag:    v2.8.0-beta

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

commit 0e88fe02274f15b8ca8bfc1470a56b82f553d0d0
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Sep 2014 17:16:15 +0800
Tag:    v2.8.0-beta

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

commit 99756ca2b425809bb864895cd5505cb68b219183
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Sep 2014 17:13:23 +0800
Tag:    v2.6.6

Merge branch 'm26_MDL-47076' of git://github.com/totara/moodle into MOODLE_26_STABLE

commit a8d69de7bd41b4428cae7159a0983369997d83fe
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Sep 2014 17:13:09 +0800
Tag:    v2.7.3

Merge branch 'm27_MDL-47076' of git://github.com/totara/moodle into MOODLE_27_STABLE

commit de62e57a9b8a535d661bd93a3c800bc5f83d5d30
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Sep 2014 17:12:28 +0800
Tag:    v2.8.0-beta

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

commit 6b2f31d9303aa7757659e30e5f0a3836693b665f
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 08 Sep 2014 14:07:26 +0800
Tag:    v2.6.6

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

commit dc2e48bda7ccf3424938fbdedfb1414ad741997a
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 08 Sep 2014 14:05:06 +0800
Tag:    v2.7.3

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

commit aea49eb5f9605dd84b04371625d311d06c57c2d4
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 08 Sep 2014 14:04:33 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46818_master' of git://github.com/markn86/moodle

commit 9251dcc683ee55810756ef11e2f6fd94da7b8c9e
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 08 Sep 2014 13:50:44 +0800
Tag:    v2.6.6

Merge branch 'MDL-46564_26' of https://github.com/totara/openbadges into MOODLE_26_STABLE

commit cf923754c6d6397ec4e3cb11e0f3501000cf678f
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 08 Sep 2014 13:50:27 +0800
Tag:    v2.6.6

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

commit dee890f67e735006c310858a4785e2ce9ae0e265
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 08 Sep 2014 13:50:19 +0800
Tag:    v2.6.6

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

commit b7b5d98a247bb561f166d6b1e3b2ad376e9a83f9
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 08 Sep 2014 13:49:41 +0800
Tag:    v2.7.3

Merge branch 'MDL-46564_27' of https://github.com/totara/openbadges into MOODLE_27_STABLE

commit 09deaef4e9a1a24b861f5e75d01998f9650cf827
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 08 Sep 2014 13:49:28 +0800
Tag:    v2.7.3

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

commit bd8eae5245f903345d152992d02245cc28a7b9ab
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 08 Sep 2014 13:49:16 +0800
Tag:    v2.7.3

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

commit 7b6eb2a1acdf073ad2cf8cbd8f0190666e7911f7
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 08 Sep 2014 13:49:01 +0800
Tag:    v2.7.3

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

commit cb1be3a7ae05ee8c2e65af10edbfa4e159273483
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 08 Sep 2014 13:48:37 +0800
Tag:    v2.8.0-beta

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

commit 2eacde6be0c521a2b392f95fbe351ec40cf8049e
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 08 Sep 2014 13:48:26 +0800
Tag:    v2.8.0-beta

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

commit 68044ce347073d01e6bc91ba7c873b3bf9d246ce
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 08 Sep 2014 13:48:15 +0800
Tag:    v2.8.0-beta

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

commit d281dffa8dcbe0676fc5ef9ac10b87552be92aba
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 08 Sep 2014 13:48:06 +0800
Tag:    v2.8.0-beta

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

commit 84ddbba784e981a212c12ebee6a484827fbff2d9
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 08 Sep 2014 12:58:41 +0800
Tag:    v2.6.6

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

commit 36d9887093321a8f11d690c3d11ea33f6da83a08
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 08 Sep 2014 12:58:12 +0800
Tag:    v2.7.3

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

commit 70fb279f563b35f0022773a4e3d7cf8aa5f9be6e
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 08 Sep 2014 12:57:41 +0800
Tag:    v2.8.0-beta

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

commit 7fde166775d19925dff72dc41179b7ac1a904dff
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 08 Sep 2014 12:57:34 +0800
Tag:    v2.8.0-beta

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

commit 6e4c10f98701095abb71fc642b3ca6c42ed89f0a
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 03 Sep 2014 16:59:38 +0800
Tag:    v2.6.5

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

commit 8f866fa1c30b568b55ef56554dc13c3264d62254
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 03 Sep 2014 16:59:16 +0800
Tag:    v2.7.2

Merge branch 'm27_MDL-46639' of git://github.com/danmarsden/moodle into MOODLE_27_STABLE

commit 1f20801c354158523dc22ec56a932fe8c9f33b3c
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 03 Sep 2014 16:58:25 +0800
Tag:    v2.8.0-beta

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

commit 390645bd44a18a53a74cceae3e6015d2708688e3
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 02 Sep 2014 09:59:20 +0800
Tag:    v2.6.5

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

commit c256614eabbc5a4d52a611d91ed078af25c16063
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 02 Sep 2014 09:58:58 +0800
Tag:    v2.7.2

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

commit d0143e006161e32bff9627e6dad9b2023770976c
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 02 Sep 2014 09:58:24 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-45952_master2' of git://github.com/Syxton/moodle

commit ecd01922e93ce46fc7e05befb099810e7aade77f
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 01 Sep 2014 16:07:05 +0800
Tag:    v2.7.2

Merge branch 'MDL-46861_27_STABLE' of https://github.com/Lightwork-Marking/moodle into MOODLE_27_STABLE

commit d0a9fa02e49e0c6d6e81488ace93f8d7ae8ae7b2
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 01 Sep 2014 16:06:22 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46861' of https://github.com/Lightwork-Marking/moodle

commit 7dc74ce75ff99432c8b5e7baf96d1bf3bd601132
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 01 Sep 2014 16:05:51 +0800
Tag:    v2.8.0-beta

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

commit 181435d483b5673c398171b164e2e4cc09393c86
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 01 Sep 2014 14:36:09 +0800
Tag:    v2.8.0-beta

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

commit c1780a3d0b723639e24deae756b8d80d9175ae36
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 01 Sep 2014 14:36:04 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46539-fix-28' of https://github.com/jmarthaler/moodle

commit bb5b3ee2633a739842a77713a25083fe4aae169b
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 01 Sep 2014 14:35:39 +0800
Tag:    v2.6.5

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

commit 6e1fdb09514fcee0333b8410d04a87df362a07e0
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 01 Sep 2014 14:35:33 +0800
Tag:    v2.6.5

Merge branch 'MDL-46539-fix-26' of https://github.com/jmarthaler/moodle into MOODLE_26_STABLE

commit 15f15ccddd6a4b24acfb583304049b5f13c12d1d
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 01 Sep 2014 14:34:52 +0800
Tag:    v2.7.2

Merge branch 'm27_MDL-46639' of git://github.com/danmarsden/moodle into MOODLE_27_STABLE

commit 346e41d0429ad0a76856ac1ef28998a3335c2637
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 01 Sep 2014 14:34:40 +0800
Tag:    v2.7.2

Merge branch 'MDL-46539-fix-27' of https://github.com/jmarthaler/moodle into MOODLE_27_STABLE

commit 124aa2558a4be20f3a22097c9b3790d3dc734f3c
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 25 Aug 2014 16:54:08 +0800
Tag:    v2.6.5

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

commit b523d5bc33bce10c189235a62c643e4e24f48b12
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 25 Aug 2014 16:53:40 +0800
Tag:    v2.7.2

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

commit 91f31c097dd46674d8535096e020ffa42536e854
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 25 Aug 2014 16:52:21 +0800
Tag:    v2.8.0-beta

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

commit 63e0fee364e3574b1bb18ecdc00336a50573c3f4
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 25 Aug 2014 16:50:05 +0800
Tag:    v2.7.2

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

commit b7e662bb1327c221ff3faa27ce378f927f2df1e4
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 25 Aug 2014 16:49:52 +0800
Tag:    v2.8.0-beta

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

commit 514a13e43188774499821c97ff18fca562ea2bb4
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 25 Aug 2014 16:30:01 +0800
Tag:    v2.6.5

Merge branch 'M26_MDL46887_assignment_file_max_size' of git://github.com/Dave-B/moodle into MOODLE_26_STABLE

commit b46ad4bdd596e1999b8e5a0b88e4773e9bc221ce
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 25 Aug 2014 16:29:33 +0800
Tag:    v2.7.2

Merge branch 'M27_MDL46887_assignment_file_max_size' of git://github.com/Dave-B/moodle into MOODLE_27_STABLE

commit e55cecf05fd03a5ba9754ceae4651abb65fa6bf4
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 25 Aug 2014 16:28:49 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL46887_assignment_file_max_size' of git://github.com/Dave-B/moodle

commit 8001ddd8b2374bf182e3a9a62e2aed4417fb34e9
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 25 Aug 2014 16:28:02 +0800
Tag:    v2.7.2

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

commit 8c1fb0f89ee8f55d34b0c0f29631105fcdd781cc
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 25 Aug 2014 16:27:49 +0800
Tag:    v2.8.0-beta

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

commit cf2d4159b7702bb6e96e9c61046d37bb248eaf54
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 25 Aug 2014 15:43:29 +0800
Tag:    v2.8.0-beta

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

commit 5cc6700f27680f461d2e9411e369bfef1de368b7
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 25 Aug 2014 14:45:38 +0800
Tag:    v2.7.2

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

commit f0623ea70eeddfbe46996678b776c41d6e4439c2
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 25 Aug 2014 14:45:22 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46450_master' of git://github.com/nadavkav/moodle

commit 241d1d42cf092cb01d08d281a7068461c33e484d
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 25 Aug 2014 14:45:05 +0800
Tag:    v2.8.0-beta

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

commit 315392626b8c518b33ea2c85f2c4aef41a7ff132
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 25 Aug 2014 12:01:27 +0800
Tag:    v2.7.2

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

commit 2ef3ecffb79829ae5f9a8b733d5577bff29a5d64
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 25 Aug 2014 12:01:10 +0800
Tag:    v2.8.0-beta

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

commit 8ef945280c173596fd590a90145eccb900b9fcf6
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 21 Aug 2014 10:18:53 +0800
Tag:    v2.7.2

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

commit ebb8098668f63fa7652ec1dbd1bf3a781d048db9
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 21 Aug 2014 10:18: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 5aec206c6601eaa5f0e6316f0baff8d98165f62b
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 21 Aug 2014 10:18:35 +0800
Tag:    v2.8.0-beta

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

commit 2a46808ed38f500014c28857b57e3cb40b354586
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 17:39:40 +0800
Tag:    v2.7.2

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

commit 376a6f687cbd244282b443f127d4dbfae8b146e6
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 17:28:55 +0800
Tag:    v2.8.0-beta

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

commit 6ee21ea1d080d3c6bd4a6c5b2151ae76a0dd8b52
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 16:57:05 +0800
Tag:    v2.8.0-beta

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

commit 2a8877376a91cc9e8d751bd8178fccf9357e0346
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 16:53:09 +0800
Tag:    v2.6.5

Merge branch 'MDL-46538_M26' of git://github.com/lazydaisy/moodle into MOODLE_26_STABLE

commit 9ddb8118668d943ad3492bcd06d503d8b95d63e9
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 16:52:08 +0800
Tag:    v2.7.2

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

commit e913caab9240e012429098d064fc1f19dfb6d982
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 16:51:46 +0800
Tag:    v2.8.0-beta

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

commit 4cb61b6b4e30f0b3385241fe9c07040ae3d197cc
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 16:26:35 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46281-master' of git://github.com/lucisgit/moodle

commit 26929ce1a7d62dab9c4bfea52e1ea3cb4e44c153
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 16:23:00 +0800
Tag:    v2.6.5

Merge branch 'MDL-46281-MOODLE_26_STABLE' of git://github.com/lucisgit/moodle into MOODLE_26_STABLE

commit bef5900bdbb0d9a90ecb372b777ac4a764a5e6bc
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 16:22:24 +0800
Tag:    v2.7.2

Merge branch 'MDL-46281-MOODLE_27_STABLE' of git://github.com/lucisgit/moodle into MOODLE_27_STABLE

commit 3e15af69dee4824f20dc773b7728863c0d38007d
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 14:22:01 +0800
Tag:    v2.6.5

Merge branch 'MDL-46833-MOODLE_26_STABLE' of git://github.com/lucisgit/moodle into MOODLE_26_STABLE

commit 623379d82b813dc2db1adfd1e2c63922ea5043a0
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 14:21:18 +0800
Tag:    v2.7.2

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

commit 8480fd9364d5b5290ef72e9eb763d9ad460ea889
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 14:21:09 +0800
Tag:    v2.7.2

Merge branch 'MDL-46833-MOODLE_27_STABLE' of git://github.com/lucisgit/moodle into MOODLE_27_STABLE

commit 816ddceceb322fdf73c13b70490c77c0ce1a3557
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 14:20:51 +0800
Tag:    v2.8.0-beta

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

commit 7e4475d37ce6e9150601c465917782434b83e923
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 14:20:41 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46833-master' of git://github.com/lucisgit/moodle

commit c86ae8660cd7482b448f240a62fd0e52ae2db38e
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 14:20:31 +0800
Tag:    v2.8.0-beta

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

commit 0f9d61091b405f8a8c868670f40e6ede15cbc850
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 14:04:21 +0800
Tag:    v2.6.5

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

commit d23d771071a5ea663ed4c8e52be21a2ab1c60386
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 14:04:05 +0800
Tag:    v2.7.2

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

commit 2c0ee558e5aee54f438e79213eb5e85d28006bac
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 14:03:27 +0800
Tag:    v2.8.0-beta

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

commit 04821cbbe7f0386e5bbb0be4cfd51c6fa07e1ada
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 14:01:48 +0800
Tag:    v2.8.0-beta

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

commit 430529bde80153af83e6ffed0f745fa8c9cdad96
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 13:50:44 +0800
Tag:    v2.8.0-beta

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

commit f09f95fefab7db1be0b2da12d02f1038f559c6b9
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 13:26:19 +0800
Tag:    v2.6.5

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

commit 5f690a9be6e02ecb4e6d8ecb9c5755eb40ee496b
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 13:26:01 +0800
Tag:    v2.7.2

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

commit dd924ea9dbc620d2df947e8183387453fcb0ad74
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 13:25:32 +0800
Tag:    v2.8.0-beta

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

commit 628b2a5cd3e9ed37889f040cd4562fe341482f95
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 11:24:41 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46796-master' of git://github.com/merrill-oakland/moodle

commit c8c0aa21e439856403fd52d4916dfd7731f7ea35
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 11:22:09 +0800
Tag:    v2.6.5

Merge branch 'm26_MDL-46775' of git://github.com/totara/moodle into MOODLE_26_STABLE

commit 690988d958304f13bfbc16e80a8d4eacfa0fac03
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 11:21:52 +0800
Tag:    v2.7.2

Merge branch 'm27_MDL-46775' of git://github.com/totara/moodle into MOODLE_27_STABLE

commit b3194ab1b25f28b70121c21fc598223eda62b5c0
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 11:21:22 +0800
Tag:    v2.8.0-beta

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

commit 26b3b4e80e1239433c8f6ed3e6c9026dcff426a8
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 10:50:34 +0800
Tag:    v2.7.2

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

commit a5e67c5bcc1ed8b115e5ab628538612877ba7d94
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 10:50:22 +0800
Tag:    v2.7.2

Merge branch 'wip-MDL-46791-MOODLE_27_STABLE' of git://github.com/satrun77/moodle into MOODLE_27_STABLE

commit 3377a87d69ccfeb07b56d50a4ac017d571272890
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 10:48:11 +0800
Tag:    v2.8.0-beta

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

commit efc815848d31265c878cdbd9690ec05b05735e37
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 10:47:55 +0800
Tag:    v2.8.0-beta

Merge branch 'wip-MDL-46791-master' of git://github.com/satrun77/moodle

commit e59d25c9443569c47bff11dfc7c92f562549e562
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 14 Aug 2014 14:52:27 +0800
Tag:    v2.7.2

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

commit aec0fcdb6e8df94d14aa8db263ffdb67dfb8cd32
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 14 Aug 2014 14:52:15 +0800
Tag:    v2.6.5

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

commit 39db49c237c304c5984bf6b7dcdf9daf75fc440b
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 14 Aug 2014 14:52:01 +0800
Tag:    v2.8.0-beta

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

commit fa386d61728f87655e05cad8ffe6ba60e286f8e2
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 13 Aug 2014 16:23:12 +0800
Tag:    v2.8.0-beta

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

commit 38a5c6861ec43d1427cecb3783a1f69528e7be0d
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 13 Aug 2014 09:25:38 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46565_master' of git://github.com/markn86/moodle

commit 63edba375c531e8d1f543ab6aa488c55e12cdbf8
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Aug 2014 16:03:07 +0800
Tag:    v2.6.5

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

commit 531b67563230fab42d84c7351ead6337e31f60d0
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Aug 2014 16:02:54 +0800
Tag:    v2.7.2

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

commit 3cef86a42b86065ac17f052d9ae111acb47ad0fe
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Aug 2014 16:02:41 +0800
Tag:    v2.8.0-beta

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

commit 530da41f3008608cc61fbc56d24a8696268ea2d5
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Aug 2014 16:02:29 +0800
Tag:    v2.6.5

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

commit c41d4355ace5f288db842cba91e0f33c4569ffe5
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Aug 2014 16:02:11 +0800
Tag:    v2.7.2

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

commit dc0f4b4f2624170a8dbced16fee74f78988e6dd9
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Aug 2014 16:01:56 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-21042_master' of git://github.com/markn86/moodle

commit 2e6188a7f2b9f8a45c7ed57ff3efa6f15c102bf5
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Aug 2014 15:22:19 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46448_rating_ajax2' of git://github.com/andyjdavis/moodle

commit 0a94ca976574b2bc619c3333c32ad6a6c87ab05c
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Aug 2014 15:03:00 +0800
Tag:    v2.6.5

Merge branch 'm26_MDL-46315' of git://github.com/totara/moodle into MOODLE_26_STABLE

commit a17f12e8018e68323ae91582d4e670db38318c12
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Aug 2014 15:02:51 +0800
Tag:    v2.6.5

Merge branch 'MDL-46600_import_failed_26' of git://github.com/andyjdavis/moodle into MOODLE_26_STABLE

commit 0faeeeea2701e97f588acd588e1b976609ad53a1
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Aug 2014 15:02:36 +0800
Tag:    v2.6.5

Merge branch 'wip_MDL-46480_m26_footernan' of git://github.com/skodak/moodle into MOODLE_26_STABLE

commit ac4bf23c02b41fd968fd29341fa0833bd38f20d5
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Aug 2014 15:02:03 +0800
Tag:    v2.7.2

Merge branch 'm27_MDL-46315' of git://github.com/totara/moodle into MOODLE_27_STABLE

commit 51c59e8b9f12941dabf3e5d8feb994c6b12f6485
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Aug 2014 15:01:55 +0800
Tag:    v2.7.2

Merge branch 'MDL-46600_import_failed_27' of git://github.com/andyjdavis/moodle into MOODLE_27_STABLE

commit 606db83726bd576043a944c2535236bb82d48950
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Aug 2014 15:01:46 +0800
Tag:    v2.7.2

Merge branch 'wip_MDL-46480_m27_footernan' of git://github.com/skodak/moodle into MOODLE_27_STABLE

commit 49b9144c878bb5c2aae62867e0b64c7570c0a746
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Aug 2014 15:01:30 +0800
Tag:    v2.8.0-beta

Merge branch 'm28_MDL-46315' of git://github.com/totara/moodle

commit e12ffe254e01dde3673f35128c009c77dbed0969
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Aug 2014 15:01:19 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46600_import_failed' of git://github.com/andyjdavis/moodle

commit 7c27c681b1545cdc3eea417473d96294526a5fc3
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Aug 2014 15:01:10 +0800
Tag:    v2.8.0-beta

Merge branch 'wip_MDL-46480_m28_footernan' of git://github.com/skodak/moodle

commit 44c2bafc1f82f3e0bec80f863c06cc0678910369
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Aug 2014 13:32:33 +0800
Tag:    v2.8.0-beta

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

commit c750f3de630c3c322e659ae2cc572c445f5a9720
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Aug 2014 13:32:03 +0800
Tag:    v2.6.5

Merge branch 'm26_MDL-46643' of git://github.com/totara/moodle into MOODLE_26_STABLE

commit a62801941e74ed60c42e04b9ad481f2dd8d7db96
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Aug 2014 13:31:41 +0800
Tag:    v2.7.2

Merge branch 'm27_MDL-46643' of git://github.com/totara/moodle into MOODLE_27_STABLE

commit ff195da1e3348f82c27667e572362f85145a7105
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Aug 2014 13:31:25 +0800
Tag:    v2.8.0-beta

Merge branch 'm28_MDL-46643' of git://github.com/totara/moodle

commit af8ef3b1da1c0c2600095bdf404e9e3dffdc9421
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Aug 2014 13:29:43 +0800
Tag:    v2.6.5

Merge branch 'MDL-43740_manual_none_26' of git://github.com/andyjdavis/moodle into MOODLE_26_STABLE

commit 0282c2086289e62d6f446c8c993bac0de6e9fc39
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Aug 2014 13:29:30 +0800
Tag:    v2.7.2

Merge branch 'MDL-43740_manual_none_27' of git://github.com/andyjdavis/moodle into MOODLE_27_STABLE

commit 36e2b86dd323093bdc97b1a682ce9b5d6a1fbe1d
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Aug 2014 13:29:15 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-43740_manual_none' of git://github.com/andyjdavis/moodle

commit 617144f163ebd53ccfde9b0f2dae8f2fc5e6f53c
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 11 Aug 2014 17:24:48 +0800
Tag:    v2.7.2

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

commit e4c2a25866f9730ed042dd3901c91ea7a0459592
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 11 Aug 2014 17:24:19 +0800
Tag:    v2.8.0-beta

Merge branch 'wip_MDL-46692_m28_forum' of git://github.com/skodak/moodle

commit b832dde880789f99ddd67450329297acbf303311
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 11 Aug 2014 17:22:13 +0800
Tag:    v2.8.0-beta

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

commit 7a4826bc3e25a8751ce9ba6cb88433ab13135e43
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 07 Aug 2014 13:15:07 +0800
Tag:    v2.7.2

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

commit 8e349b6d67416ca6607cb6e32cd9a8332384e50c
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 07 Aug 2014 13:15:00 +0800
Tag:    v2.6.5

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

commit d28f9786497b63c872b5d1f87c2894639752f944
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 07 Aug 2014 13:14:52 +0800
Tag:    v2.8.0-beta

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

commit c293baee2e37240946b6d360920daf1feaa93ea9
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 07 Aug 2014 10:02:25 +0800
Tag:    v2.8.0-beta

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

commit 4b9bcb52648936e1c4fc608febe944a422e30427
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 07 Aug 2014 10:01:24 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-32917-master-1' of https://github.com/andrewnicols/moodle

commit da45b022f2db0ba68d44761f68d1790b517a187a
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Aug 2014 15:13:30 +0800
Tag:    v2.8.0-beta

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

commit 3000cb1ee213d9b8f15420e183facf3f698afd53
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Aug 2014 14:25:16 +0800
Tag:    v2.6.5

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

commit 59fe1b009fe345701f3c3f5ae6cc6113bf6bd054
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Aug 2014 14:24:51 +0800
Tag:    v2.7.2

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

commit 91a4788b17b0032b7b9b1f99990ef938423534fa
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Aug 2014 14:24:04 +0800
Tag:    v2.8.0-beta

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

commit 942aa06e9163bc4c72f24fcb00a15e7be58c415e
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Aug 2014 14:23:38 +0800
Tag:    v2.8.0-beta

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

commit 216da8ebb06b370ee48a0728b031625f2c4698a4
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Aug 2014 11:25:10 +0800
Tag:    v2.6.5

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

commit 1818308bcad63f7e75942ca02ab334513684f881
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Aug 2014 11:24:30 +0800
Tag:    v2.7.2

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

commit b47604e938e678be4bead13952a386d8aa4032f7
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Aug 2014 11:24:17 +0800
Tag:    v2.7.2

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

commit 5fcdf220343d9871ab6d0c3db08c6eceeee341c2
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Aug 2014 11:23:10 +0800
Tag:    v2.8.0-beta

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

commit d3bf99502c2acd98a87e01126c62bec0a6a5d7e2
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Aug 2014 11:22:53 +0800
Tag:    v2.8.0-beta

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

commit eb06c9e9e2a6abf27e10443f86333279d354b605
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Aug 2014 11:22:36 +0800
Tag:    v2.8.0-beta

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

commit 05d311caa53fc36aa77c6e97160aa533a6077234
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 29 Jul 2014 12:10:34 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46465_chat_style' of git://github.com/andyjdavis/moodle

commit 2d1ac616e8bd7d7ab477a869ff88ff571302f465
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 29 Jul 2014 11:59:29 +0800
Tag:    v2.6.5

Merge branch 'm26_MDL-46325' of git://github.com/totara/moodle into MOODLE_26_STABLE

commit 33c3193f06fa617549f4e6ba88e626ab2c8e6913
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 29 Jul 2014 11:58:55 +0800
Tag:    v2.7.2

Merge branch 'm27_MDL-46325' of git://github.com/totara/moodle into MOODLE_27_STABLE

commit ef7c084b399661b1fbb92d427dcf4b5295bbda4a
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 29 Jul 2014 11:58:24 +0800
Tag:    v2.8.0-beta

Merge branch 'm28_MDL-46325' of git://github.com/totara/moodle

commit 68373c7821f48b13bf4bffa5e1160fd5d0b3b3d2
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 28 Jul 2014 16:00:48 +0800
Tag:    v2.8.0-beta

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

commit 8f2db3c1a1c583f7ec6c2d6b68dbe7f561492ce7
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Jul 2014 13:51:57 +0800
Tag:    v2.6.4

Merge branch 'MDL-46229_26' of https://github.com/totara/openbadges into MOODLE_26_STABLE

commit 84d2c6f7611e5b360111b1730f6af604010b0da3
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Jul 2014 13:51:40 +0800
Tag:    v2.7.1

Merge branch 'MDL-46229_27' of https://github.com/totara/openbadges into MOODLE_27_STABLE

commit 41dcab66d1d55aa0141f79872e82795235e35b42
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 02 Jul 2014 11:52:12 +0800
Tag:    v2.8.0-beta

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

commit d70fe4f8d915142601b72dab83ac830264aaee39
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 26 Jun 2014 10:26:59 +0800
Tag:    v2.8.0-beta

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

commit 89d91403f9b4d2f0ca19e5e4f9c6d4e5631d7bb3
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Jun 2014 16:14:31 +0800
Tag:    v2.8.0-beta

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

commit 76b320818ab444a7699223a6ab76c045e4706edc
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Jun 2014 13:52:54 +0800
Tag:    v2.6.4

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

commit 80bb90c3cab7e61b4fd085c40f6c9953972e8a57
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Jun 2014 13:52:42 +0800
Tag:    v2.7.1

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

commit 9cd596616856cbb8acbbbbbc16f7283e27ba8f80
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Jun 2014 13:52:30 +0800
Tag:    v2.8.0-beta

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

commit a3ddcab336e95d3368322de0da02709f1d8cdcba
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Jun 2014 13:52:14 +0800
Tag:    v2.7.1

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

commit 8d879f3928d4dc5078f07e933992b9fdec8d6a11
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Jun 2014 13:51:30 +0800
Tag:    v2.8.0-beta

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

commit bb9fd6b29d2aba4848ff21758d311e8dee204d3a
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Jun 2014 13:51:20 +0800
Tag:    v2.8.0-beta

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

commit a839769c23fa7abe3e977b2e87cc33acc7c18ee0
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Jun 2014 13:32:25 +0800
Tag:    v2.7.1

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

commit 5c5d182301723047964c91e5700c6f5cc0e98ef9
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Jun 2014 13:32:13 +0800
Tag:    v2.8.0-beta

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

commit e0e6a127fa6d91da14b6348bc588ff7091bc02ac
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Jun 2014 13:29:20 +0800
Tag:    v2.6.4

Merge branch 'MDL-45044-m26-master' of git://github.com/dthies/moodle into MOODLE_26_STABLE

commit 1eb503b379d3b83dbad95204caeb16a01adc260b
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Jun 2014 13:29:06 +0800
Tag:    v2.7.1

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

commit 245697d7bdc86952a2a5b4733ee77a3a3d7ccb80
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Jun 2014 13:28:51 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-45044-master' of git://github.com/dthies/moodle

commit c436a90dfb30030d5770ed053298954e5a30d393
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 23 Jun 2014 11:34:27 +0800
Tag:    v2.8.0-beta

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

commit 7bea1ea240bb0b13ef10c308682cbdbe9e9d9a53
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 23 Jun 2014 11:34:10 +0800
Tag:    v2.7.1

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

commit 47b933df3d2779c40dcd1a7eeb86d923719f4f36
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 23 Jun 2014 11:33:50 +0800
Tag:    v2.8.0-beta

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

commit 65f4667348ef1115e3b1c1d7a281a77f2049a35a
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 17 Jun 2014 13:08:14 +0800
Tag:    v2.8.0-beta

Merge branch 'wip_MDL-45941_m28_message' of git://github.com/skodak/moodle

commit b657f6db05667fc1165e13e1ade200ba48f58c51
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 16 Jun 2014 17:28:30 +0800
Tag:    v2.7.1

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

commit db8071a7f9252724e9b47718f7628cd2634e0481
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 16 Jun 2014 17:28:15 +0800
Tag:    v2.8.0-beta

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

commit 827fbc4515706081e037a39168b6c455d944175a
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 16 Jun 2014 17:27:54 +0800
Tag:    v2.6.4

Merge branch 'MDL-45901_Quiz_MOODLE-26-STABLE' of git://github.com/nadavkav/moodle into MOODLE_26_STABLE

commit abd980d36d7e66115854ab0fa96de273538dbe57
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 16 Jun 2014 17:27:40 +0800
Tag:    v2.7.1

Merge branch 'MDL-45901_Quiz_MOODLE-27-STABLE' of git://github.com/nadavkav/moodle into MOODLE_27_STABLE

commit c1264136559dc052d5188dad3126f0aeae2a19dc
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 16 Jun 2014 17:27:20 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-45901_Quiz_master' of git://github.com/nadavkav/moodle

commit e4a56bd9dd1155ec9450339319fb689e0688da32
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 16 Jun 2014 17:24:10 +0800
Tag:    v2.7.1

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

commit 14422ae946388d5da7649fe57ee977116809299f
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 16 Jun 2014 17:23:53 +0800
Tag:    v2.8.0-beta

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

commit 0e96add9315fb8dab9229bf6a0aaf540e895b6c3
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 16 Jun 2014 14:24:22 +0800
Tag:    v2.6.4

Merge branch 'MDL-35648-v26' of git://github.com/danielneis/moodle into MOODLE_26_STABLE

commit 196c818a91ccf9664dca83b0118fdd78eef8329c
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 16 Jun 2014 14:23:01 +0800
Tag:    v2.6.4

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

commit 95d39aabc7fd1f8f0d83092c1012b49d7233eb15
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 16 Jun 2014 14:22:42 +0800
Tag:    v2.7.1

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

commit 4a61670aed7bd7161e5be8a8da81be5db153ac73
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 16 Jun 2014 14:02:38 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-35648' of git://github.com/danielneis/moodle

commit 6581e387a0699b703e03b1375a3cf4afc4b01303
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 16 Jun 2014 14:02:17 +0800
Tag:    v2.8.0-beta

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

commit 5adb8d86bd98cb2338824e87d960f9e0500aeb10
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Jun 2014 20:08:06 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-45763-master' of git://github.com/merrill-oakland/moodle

commit ffa71ca45eeddf492e0a7e5d9a01e0176c426323
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Jun 2014 15:42:56 +0800
Tag:    v2.7.1

Merge branch 'MDL-45813-scheduled_task_27' of git://github.com/mudrd8mz/moodle into MOODLE_27_STABLE

commit 4422b0806871e0d0f47d8f6ab98d98dd41e785ff
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Jun 2014 15:42:42 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-45813-scheduled_task' of git://github.com/mudrd8mz/moodle

commit 38083d7ff3ada17395c1fb1461d3e995c94af275
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Jun 2014 15:42:27 +0800
Tag:    v2.6.4

Merge branch 'MDL-20154-26' of git://github.com/merrill-oakland/moodle into MOODLE_26_STABLE

commit 5248eb88311ffcb44032482e4dabeba57624e5bc
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Jun 2014 15:42:13 +0800
Tag:    v2.7.1

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

commit 410bb9a92c299f4c5c871e92a62245e1f7560088
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Jun 2014 15:41:53 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-20154-master' of git://github.com/merrill-oakland/moodle

commit fde80766e212a046b61a2f084828955cf7ee2417
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Jun 2014 14:20:34 +0800
Tag:    v2.6.4

Merge branch '26STABLE-wip-MDL45846' of git://github.com/jennymgray/moodle into MOODLE_26_STABLE

commit 251fd097bb1618850c4a5d9807408474eefb560a
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Jun 2014 14:20:02 +0800
Tag:    v2.7.1

Merge branch '27STABLE-wip-MDL45846' of git://github.com/jennymgray/moodle into MOODLE_27_STABLE

commit 0b74d45c70d115c09f49b5a691aad007cb7d4577
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Jun 2014 14:19:45 +0800
Tag:    v2.8.0-beta

Merge branch 'wip-MDL45846' of git://github.com/jennymgray/moodle

commit a9af7d94e11e3f660955ceba95896f9af3677d80
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Jun 2014 17:25:22 +0800
Tag:    v2.6.4

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

commit 238c38801687505dd098ac89c900299540959bad
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Jun 2014 17:24:36 +0800
Tag:    v2.7.1

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

commit 8c46fc33dcba0228947f14d610bcc8d9db2cf592
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Jun 2014 17:23:54 +0800
Tag:    v2.8.0-beta

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

commit 3f445e4e23056c302c2a10c334f06f426bad605b
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Jun 2014 17:23:42 +0800
Tag:    v2.8.0-beta

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

commit 6fc8187375b21b1c669ca426df6dd8981348f902
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 04 Jun 2014 12:59:42 +0800
Tag:    v2.7.1

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

commit b60e8bb8fa730d1ebbec8cfc15a643421318171c
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 04 Jun 2014 12:58:03 +0800
Tag:    v2.8.0-beta

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

commit 6526c489090e80077323dac039b7f2a51cb82b9f
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 04 Jun 2014 10:08:10 +0800
Tag:    v2.8.0-beta

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

commit 03138971086260f4ef55f8a80574924736e27147
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 04 Jun 2014 10:07:03 +0800
Tag:    v2.8.0-beta

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

commit 3d9ea145c281df7b6c5f8a826db7a7487cda0c6d
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 03 Jun 2014 17:32:36 +0800
Tag:    v2.8.0-beta

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

commit a267e328486bab57eda672d10505ae4de9783049
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 26 May 2014 14:47:54 +0800
Tag:    v2.5.7

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

commit ccffe26dbb3171f6116275ba4da7e1a26eb4d406
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 26 May 2014 14:47:45 +0800
Tag:    v2.5.7

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

commit a8b6eaa3c47be996c404e0409498d20e480aacd8
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 26 May 2014 14:46:55 +0800
Tag:    v2.6.4

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

commit 25f6bc111d8636f58f3dcff7d4bf541f61173a14
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 26 May 2014 14:46:47 +0800
Tag:    v2.6.4

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

commit 87c1a30b1f93f0195dec9ac77b0844903cb54614
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 26 May 2014 14:40:56 +0800
Tag:    v2.8.0-beta

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

commit 8a564deb07e6dc135c1f42445ac1a8ed4c602866
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 26 May 2014 14:40:48 +0800
Tag:    v2.8.0-beta

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

commit 7c399a1ba0cb7043dccd7df35ad4055f81f5bf2a
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 26 May 2014 11:59:47 +0800
Tag:    v2.6.4

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

commit 9e41209bbaed146aedcce2a8dc1bfbdf934380b1
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 26 May 2014 11:58:50 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-45629_master' of git://github.com/markn86/moodle

commit 0251be5bcc39c14d548a39f0c04e3fd72dfbf2e9
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 26 May 2014 11:58:43 +0800
Tag:    v2.8.0-beta

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

commit 4b7af5040d99b63b5d73f3ffb1851e813dbabe60
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 22 May 2014 12:59:56 +0800
Tag:    v2.8.0-beta

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

commit f7bb24c2c9e2aa2dc8967f1ab6412950d431c8e4
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 20 May 2014 14:30:38 +0800
Tag:    v2.5.7

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

commit 1cbfc116120ac96d22b9455ef3bfdd9847edf537
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 20 May 2014 14:30:14 +0800
Tag:    v2.6.4

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

commit 78ee646dd9845a2031e4f2153de72aab34a49631
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 20 May 2014 14:28:36 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-45525-27' of git://github.com/jethac/moodle

commit f5ad923b9702656a34da3fb5b361b0cf4248452d
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 20 May 2014 14:27:07 +0800
Tag:    v2.5.7

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

commit bf75a73cc5b4784ed49c168fe4d31010b5f3ce5f
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 20 May 2014 14:26:31 +0800
Tag:    v2.6.4

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

commit 143eef0e377d1b9d34d7dcea6e5affc53d7dc61b
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 20 May 2014 14:25:10 +0800
Tag:    v2.8.0-beta

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

commit c962724c1906fd3f4e81374031df4dbe962a2b68
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 20 May 2014 14:23:07 +0800
Tag:    v2.5.7

Merge branch 'wip-MDL-45512-25' of git://github.com/abgreeve/moodle into MOODLE_25_STABLE

commit 97dc7bfc0bbdf66d2748982934a9754cc9cd2ebf
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 20 May 2014 14:22:51 +0800
Tag:    v2.6.4

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

commit fdece45b06d560d1e713a51921e78990b7f9f1fa
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 20 May 2014 14:21:56 +0800
Tag:    v2.8.0-beta

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

commit f60c23a7812ec1db87f6e65b326d789557d7ee79
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 20 May 2014 14:16:27 +0800
Tag:    v2.6.4

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

commit 4cc89d51ebabb4f96f3f741c6e9cbcd160a6f615
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 20 May 2014 14:12:38 +0800
Tag:    v2.8.0-beta

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

commit bced459a23fcde65ccfc5958d78fa9e6bc6d481d
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 20 May 2014 14:12:13 +0800
Tag:    v2.5.7

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

commit 2b0b60631d8e80b928a38136c03b87e79f678a1c
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 20 May 2014 14:11:57 +0800
Tag:    v2.6.4

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

commit 4d46c88b9ffef3ef4c6738a70d2a8abbb30648da
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 20 May 2014 14:10:03 +0800
Tag:    v2.8.0-beta

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

commit dd206a8daa6f45769cb6c9c650f1f6bda98822e2
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 20 May 2014 09:53:02 +0800
Tag:    v2.5.7

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

commit 0e46c03356ef2fc5a687d7b7e2125c9a71f1875b
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 20 May 2014 09:52:48 +0800
Tag:    v2.6.4

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

commit f0085cd6ab18797c2cb5a7422f8509c986596e10
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 20 May 2014 09:52:25 +0800
Tag:    v2.8.0-beta

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

commit f50bf62da66963b92c283f5b0aa72385e5e46d34
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 19 May 2014 17:29:27 +0800
Tag:    v2.8.0-beta

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

commit c24b3e19899869021fba3e18a0caa4bcd638c56a
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 19 May 2014 15:57:34 +0800
Tag:    v2.5.7

Merge branch 'wip-MDL-45483-MOODLE_25_STABLE' of https://github.com/kwiliarty/moodle into MOODLE_25_STABLE

commit 95f9c8f71603123d7e044838f46d2d690c083bd7
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 19 May 2014 12:39:43 +0800
Tag:    v2.7.1

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

commit 709f70145ff521a936c3f307caaad2bf81a67b1e
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 19 May 2014 12:38:47 +0800
Tag:    v2.6.4

Merge branch 'wip-MDL-45483-MOODLE_26_STABLE' of https://github.com/kwiliarty/moodle into MOODLE_26_STABLE

commit 170392d4a0105ab90b0bd4a4390fcf30af884bfe
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 19 May 2014 12:37:59 +0800
Tag:    v2.7.1

Merge branch 'wip-MDL-45483-MOODLE_27_STABLE' of https://github.com/kwiliarty/moodle into MOODLE_27_STABLE

commit 1de6c62dc7ebe802d2f7931b99b0ff58d41450fb
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 19 May 2014 12:37:10 +0800
Tag:    v2.8.0-beta

Merge branch 'wip-MDL-45483-master' of https://github.com/kwiliarty/moodle

commit b91be533d11263f6e0b749d8af5ca49b0ce4ff63
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 14 May 2014 16:36:52 +0800
Tag:    v2.5.7

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

commit 2538062907d6f95897782d762676c95929b7afde
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 14 May 2014 16:35:59 +0800
Tag:    v2.6.4

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

commit 363c49f4c83f299634ed4c938a14d5b1c0a83318
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 14 May 2014 16:34:52 +0800
Tag:    v2.8.0-beta

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

commit 912a0fd0506be5facc327912944123409d3711fe
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 12 May 2014 16:24:31 +0800
Tag:    v2.8.0-beta

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

commit d713240ef820137c074553c368ac32ad2a895071
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 08 May 2014 19:51:58 +0800
Tag:    v2.5.6

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

commit 30dc7fe149001a60d943737eaa1177b7673463c5
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 08 May 2014 19:51:31 +0800
Tag:    v2.6.3

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

commit 585ff7eaecd13f9aa5f70d4d0c855c6cb49db4b5
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 08 May 2014 19:50:13 +0800
Tag:    v2.7.0-rc2

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

commit 9a9b5257fadc3923062743dd32f243bdc7726c13
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 08 May 2014 15:41:20 +0800
Tag:    v2.7.0-rc2

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

commit b76ae3b0cea34c74b2a91425ece90585679c7cc8
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 08 May 2014 12:05:20 +0800
Tag:    v2.7.0-rc2

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

commit f69c0d572ec39f6790e9f37f8a71d414e5767f97
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 08 May 2014 12:04:53 +0800
Tag:    v2.7.0-rc2

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

commit 18a1f91b2c785ce90eda2b074c70a820b4e802c7
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 07 May 2014 16:54:01 +0800
Tag:    v2.5.6

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

commit da6b75343a9700277ebf2efc8f17bf636edd8e40
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 07 May 2014 16:53:16 +0800
Tag:    v2.6.3

Merge branch 'MDL-45282_message_26' of git://github.com/andyjdavis/moodle into MOODLE_26_STABLE

commit 2cba18ee43af58871da1c7af4a2f476eee315d9e
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 07 May 2014 16:52:11 +0800
Tag:    v2.7.0-rc2

Merge branch 'MDL-45282_message' of git://github.com/andyjdavis/moodle

commit 0f3f3b3b01962a78281e88058c752944ef28f4f0
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 07 May 2014 13:07:53 +0800
Tag:    v2.5.6

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

commit 72e9e72b170ed13725e83839184a06612561a45c
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 07 May 2014 13:07:44 +0800
Tag:    v2.5.6

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

commit 9b33dd001fee9e589aa338b3c1c3c7339a3c37de
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 07 May 2014 13:07:18 +0800
Tag:    v2.6.3

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

commit 80efce1bc93c72f16e757b8afad4eb9d054bfc55
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 07 May 2014 13:07:08 +0800
Tag:    v2.6.3

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

commit 97436e311c05dd1bef7bb875b23a9d112f9475ae
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 07 May 2014 13:06:30 +0800
Tag:    v2.7.0-rc2

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

commit 90ce5afd8142aac28bafba4818cecd64b4083dbf
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 07 May 2014 13:06:17 +0800
Tag:    v2.7.0-rc2

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

commit e7efd59b519370f9d91f820d59ba2da3e28b0675
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 06 May 2014 12:19:58 +0800
Tag:    v2.7.0-rc2

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

commit 698f4d27dec4d6649a5741187099bd455c9ca9e2
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 May 2014 17:44:28 +0800
Tag:    v2.5.6

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

commit 74d62545da9e13dadd77feee764b7bc6e031cdc8
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 May 2014 17:44:02 +0800
Tag:    v2.6.3

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

commit 6df154bd208d992613878fd5e6532ab21e0934dc
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 May 2014 17:41:01 +0800
Tag:    v2.7.0-rc2

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

commit 42c95439ab19f30b18fd8ecdc0579824cd9d68a6
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 May 2014 17:20:58 +0800
Tag:    v2.5.6

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

commit ab0b3fc51ecca8d56d27a99d65bd1c17cec4a9ea
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 May 2014 17:20:45 +0800
Tag:    v2.5.6

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

commit 5f320315e5abcc6d48863959a423cb8dc338922b
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 May 2014 17:20:36 +0800
Tag:    v2.5.6

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

commit d1f5077f84417056acfe287278fd4d09acefa0cb
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 May 2014 17:19:51 +0800
Tag:    v2.6.3

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

commit 8dfd2e2407afaac61f18004be2b49262cfeaec77
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 May 2014 17:19:39 +0800
Tag:    v2.6.3

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

commit 09bf74f26531c31f906eeca9b97873bb1c620dea
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 May 2014 17:19:29 +0800
Tag:    v2.6.3

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

commit a7c1a5bcb59fddcdf338ebd62acba1d452828b8c
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 May 2014 17:18:04 +0800
Tag:    v2.7.0-rc2

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

commit 4cbe8be96dd927f9a51850e82b51c6d40cb2ccbe
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 May 2014 17:17:45 +0800
Tag:    v2.7.0-rc2

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

commit cbc394fabf46e8aad4eb2a2f12bf1aff486b4893
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 May 2014 17:17:30 +0800
Tag:    v2.7.0-rc2

Merge branch 'MDL-43319-master' of git://github.com/danpoltawski/moodle

commit d0144cd38ef7139d5e1d4d79eab980fdc62223fe
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 May 2014 17:17:11 +0800
Tag:    v2.7.0-rc2

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

commit b9c5bae5b1e7c92743fe4836067380b3b0796666
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 May 2014 17:16:52 +0800
Tag:    v2.7.0-rc2

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

commit 16feb870d41f8798c9c106c634788ae0945dd1e4
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 May 2014 16:09:53 +0800
Tag:    v2.7.0-rc2

Merge branch 'MDL-45357_master' of git://github.com/markn86/moodle

commit 5eb5b4d9bffdffd798f111c5f1557823925f1e97
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 May 2014 10:18:56 +0800
Tag:    v2.5.6

Merge branch 'wip-MDL-45127-25' of git://github.com/abgreeve/moodle into MOODLE_25_STABLE

commit a0a7521e5b16fa5bcba51d3ce614a09c3406c544
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 May 2014 10:18:25 +0800
Tag:    v2.6.3

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

commit a128a24fcaf401a30c5ecb30d2ecbb365f788a45
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 May 2014 10:18:03 +0800
Tag:    v2.7.0-rc2

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

commit e2c3c3e080e9b4b8f1e3dcd0f4955343c6a210c6
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 02 May 2014 11:13:06 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-45237-master' of git://github.com/danpoltawski/moodle

commit 3409fac5ef709f0ce4640c690edb0cd8903d019b
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 01 May 2014 21:17:01 +0800
Tag:    v2.7.0-rc1

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

commit 097efb8b412179187bd023188a64ab6373cc364a
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 01 May 2014 21:16:47 +0800
Tag:    v2.7.0-rc1

Merge branch 'wip-MDL-43557-master' of https://github.com/abgreeve/moodle

commit d9dd21fd4e3ff9fd361c0ea2ec41918cca24bb66
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 01 May 2014 14:22:12 +0800
Tag:    v2.5.6

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

commit 3e1b758044a6864adf77a145ab043bab57c30e92
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 01 May 2014 14:21:59 +0800
Tag:    v2.6.3

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

commit cb3cc79c827bbaa335d5836899395377d50ef337
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 01 May 2014 14:21:39 +0800
Tag:    v2.7.0-rc1

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

commit 10d96f0e37522476d6c1e2420366d80639134314
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 01 May 2014 12:20:07 +0800
Tag:    v2.6.3

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

commit ea50fe37c842ffaa95f87a3a934ed50562d2417a
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 01 May 2014 12:16:48 +0800
Tag:    v2.7.0-rc1

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

commit f1251b77306e551467f4796008437aa5899190a8
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 01 May 2014 12:04:11 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-45314_resize' of git://github.com/andyjdavis/moodle

commit 0b4d7c9bc7c43df2509b9dea8e53bba175363262
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 01 May 2014 11:49:40 +0800
Tag:    v2.5.6

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

commit 3d7b97824701791f82264e2c8bb8436f7d5e45dd
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 01 May 2014 11:48:47 +0800
Tag:    v2.6.3

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

commit a608d3f40b68c0afc9745f9f0d22c447b52f867e
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 01 May 2014 11:48:00 +0800
Tag:    v2.7.0-rc1

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

commit 2027ee89e30f12002113438e49449940f9fa6e9f
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 01 May 2014 11:47:51 +0800
Tag:    v2.7.0-rc1

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

commit 64db8b7bcf1bae1d22c3570f9551a6a06ef68bfd
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 01 May 2014 11:47:40 +0800
Tag:    v2.7.0-rc1

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

commit 85055505321f032bb7d1fbd6614a6854848e5fbc
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 01 May 2014 11:47:27 +0800
Tag:    v2.7.0-rc1

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

commit d2d4a49091276fc48e92439220c68f31d7110bdf
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 01 May 2014 11:22:54 +0800
Tag:    v2.7.0-rc1

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

commit 6776b3ffa06cbb33d6419762cca1026cfd9fa16e
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 30 Apr 2014 15:12:56 +0800
Tag:    v2.7.0-rc1

Merge branch 'w19_MDL-43557_m27_cleanup' of git://github.com/skodak/moodle

commit 6032ae0f134674ba83d631a8c0b0afb0af09d697
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 30 Apr 2014 15:12:31 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-43557_master' of git://github.com/markn86/moodle

commit 3f0a5f287a402506f4dfd0acfd06767b8bf4e008
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 30 Apr 2014 10:05:11 +0800
Tag:    v2.7.0-rc1

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

commit 00cb2f0010597b34f0c22c1a08adaf9126b97a1c
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 30 Apr 2014 09:55:25 +0800
Tag:    v2.7.0-rc1

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

commit 8ced50e3da9e0bec8448fd0c7a27672b2ed36297
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 30 Apr 2014 09:55:10 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-45315-master' of git://github.com/danpoltawski/moodle

commit 067a1bcb4d44dd13392d89d4f48cde5528d1cf3e
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 30 Apr 2014 09:54:39 +0800
Tag:    v2.6.3

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

commit 049c8ed4d109ca498af12195dc8fa89d3240aa01
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 30 Apr 2014 09:54:27 +0800
Tag:    v2.6.3

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

commit 458d13af33ac1ed5fbfc4fec4e60559c147cb240
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 30 Apr 2014 09:53:53 +0800
Tag:    v2.5.6

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

commit a8294bd9558863706d96a509b287f0c47c1a06bc
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 29 Apr 2014 17:27:56 +0800
Tag:    v2.7.0-rc1

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

commit 0af422fe0fbf44a4b3d36c791b7468ec0562d500
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 29 Apr 2014 13:02:41 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-44614_master-missing-upload' of git://github.com/dmonllao/moodle

commit a169c0213d2f7db1dbb3869b7cba5695e75176dd
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 29 Apr 2014 12:50:54 +0800
Tag:    v2.5.6

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

commit a632d590f3c46e3fcfdd0bd81273025935c27dba
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 29 Apr 2014 12:50:05 +0800
Tag:    v2.6.3

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

commit 506b3e2317802d0d085698198cd3fdb59d334c2c
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 29 Apr 2014 12:49:30 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-45289-master' of git://github.com/danpoltawski/moodle

commit b8f41dfa45d2742c175ae5d016e943a897d5b6ce
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 28 Apr 2014 20:18:43 +0800
Tag:    v2.5.6

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

commit 93b2d3baca6a4be2991f70285079ef3480efb4a4
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 28 Apr 2014 20:18:19 +0800
Tag:    v2.6.3

Merge branch 'w18_MDL-45287_m26_dbreset' of git://github.com/skodak/moodle into MOODLE_26_STABLE

commit cd360f69a4baa3aafbdf5e6ac05fe7145ea1f0cd
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 28 Apr 2014 20:17:57 +0800
Tag:    v2.7.0-rc1

Merge branch 'w18_MDL-45287_m27_dbreset' of git://github.com/skodak/moodle

commit 33ee767041e790da0e2ee56c6fe36b42b237622a
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 28 Apr 2014 18:03:38 +0800
Tag:    v2.5.6

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

commit 9a1227cf54050d41d5aba1fcc110069f3b5f6f64
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 28 Apr 2014 18:03:20 +0800
Tag:    v2.5.6

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

commit 795fb4aea477b095653cec3c7b5f98f7cd0ad6ae
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 28 Apr 2014 18:02:36 +0800
Tag:    v2.6.3

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

commit 7b6bdc91e96334094e0521049065f5d4f8f6b002
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 28 Apr 2014 18:02:25 +0800
Tag:    v2.6.3

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

commit db9cd0b0853efd006b300908e92933310817e75f
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 28 Apr 2014 18:01:27 +0800
Tag:    v2.7.0-rc1

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

commit e8277bd88658ceb3e517f6abc488c606ec1ce48b
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 28 Apr 2014 18:01:15 +0800
Tag:    v2.7.0-rc1

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

commit 2666d179fff2399d0d10a915aefe78b0cbc403e3
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 28 Apr 2014 18:00:57 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-45266-master' of git://github.com/danpoltawski/moodle

commit 72983c8569463e0ff36770222c7fb3efcd1bf7e9
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 28 Apr 2014 13:49:19 +0800
Tag:    v2.5.6

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

commit 14df84f65e294b18be4ff15282a8ffc87bc756f7
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 28 Apr 2014 13:49:02 +0800
Tag:    v2.6.3

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

commit 254402dbbec1087651b92535fb52e8609724fe48
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 28 Apr 2014 13:48:18 +0800
Tag:    v2.7.0-rc1

Merge branch 'w17_MDL-45128_m27_stats' of git://github.com/skodak/moodle

commit 37501cac1ce5283cf26ddc27eb06c067f8a15fcb
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 28 Apr 2014 13:48:09 +0800
Tag:    v2.7.0-rc1

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

commit 7ca387b3cfbede0ccccaf9b1de5a5c4098971947
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 28 Apr 2014 13:04:08 +0800
Tag:    v2.6.3

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

commit f6db769eb2b1640825d7f529ed1a603e9342172f
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 28 Apr 2014 13:03:39 +0800
Tag:    v2.7.0-rc1

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

commit c6b4a7f4a2d75afd0453c25f44c8ae082a212725
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 28 Apr 2014 12:43:37 +0800
Tag:    v2.7.0-rc1

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

commit be2c92d3a1462d6afb4736048fa5924fea60a77e
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 28 Apr 2014 11:17:30 +0800
Tag:    v2.5.6

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

commit 4f214c3b644da6ecd8b12056b32db19e552857c9
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 28 Apr 2014 11:17:06 +0800
Tag:    v2.6.3

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

commit e865dff3bbc34898255735f23cd24b732c837361
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 28 Apr 2014 11:16:45 +0800
Tag:    v2.7.0-rc1

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

commit 1f2e95e7ebfd9a9bfa348abc6afa67352a02cba1
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 28 Apr 2014 10:46:50 +0800
Tag:    v2.6.3

Merge branch 'm26_MDL-45210' of git://github.com/totara/moodle into MOODLE_26_STABLE

commit 566fd05d218cfd1e495d13b60596d73d5e22a05b
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 28 Apr 2014 10:46:04 +0800
Tag:    v2.7.0-rc1

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

commit 3a0edd1fcd7dcc3d48d2e9da956f5dc5d3a45a43
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 28 Apr 2014 10:44:36 +0800
Tag:    v2.7.0-rc1

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

commit a44b25a3d3f3169bf87c132be89e6353b1a5d8d3
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 24 Apr 2014 16:33:57 +0800
Tag:    v2.7.0-rc1

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

commit e4f066d1b1b63309b46b97306b614420114ccaaf
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 24 Apr 2014 14:14:13 +0800
Tag:    v2.5.6

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

commit 7b99722e934782474d7ca2e543f9600274bffb46
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 24 Apr 2014 14:00:46 +0800
Tag:    v2.7.0-rc1

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

commit faf67a87a058f19efaa0dc53e8e8afe01aff6acb
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 24 Apr 2014 12:00:00 +0800
Tag:    v2.7.0-rc1

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

commit eb2d613ce03ac463c052c9d1752342b25cf57db3
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 24 Apr 2014 11:54:10 +0800
Tag:    v2.7.0-rc1

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

commit 3ebfb87878c9ef69007d40ba15df9379f63c9539
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Apr 2014 15:25:01 +0800
Tag:    v2.7.0-rc1

Merge branch 'w17_MDL-45219_m27_addtolog' of git://github.com/skodak/moodle

commit ba7a72d41397a22dabf7af3ce8082b49358b9e62
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Apr 2014 14:46:57 +0800
Tag:    v2.5.6

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

commit 5db4854d64b7491ed3df9af742b2c32167047cce
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Apr 2014 14:46:16 +0800
Tag:    v2.6.3

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

commit 66d31881124795c15c0c9d98b2ef379a545eb959
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Apr 2014 14:45:59 +0800
Tag:    v2.7.0-rc1

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

commit 19a1a68e453fb93770f0fbd9824cbcb04744b503
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Apr 2014 14:33:51 +0800
Tag:    v2.7.0-rc1

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

commit cae96c621795d74d399266a57ec7b74206d60525
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Apr 2014 14:33:12 +0800
Tag:    v2.7.0-rc1

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

commit e7c8139f5376e356763751b0f46ca6ef831e4b40
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Apr 2014 13:26:18 +0800
Tag:    v2.5.6

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

commit b3799a8678c20b5f7412a17cd338721b8472ef4b
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Apr 2014 13:25:38 +0800
Tag:    v2.6.3

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

commit cc2c7d67679379c87ba3e6f45545462c44a498aa
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Apr 2014 13:24:54 +0800
Tag:    v2.7.0-rc1

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

commit a20ec8a0eb07d5e89118bb6b5a4e9e06f5cb9740
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Apr 2014 13:23:46 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-45109_master' of git://github.com/nadavkav/moodle

commit fa4df78be0cd6020bbc0dcb89897ab6785b1618b
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Apr 2014 13:14:59 +0800
Tag:    v2.5.6

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

commit b212e892313bf6a9d0af530ca8f91a0121013d20
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Apr 2014 13:13:56 +0800
Tag:    v2.6.3

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

commit ff35a0129fac64e319f4484a62b5af5504dadd9e
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Apr 2014 13:12:25 +0800
Tag:    v2.7.0-rc1

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

commit 14ccfec4e157c97385064838007e99d8746e6a6f
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Apr 2014 13:11:23 +0800
Tag:    v2.7.0-rc1

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

commit 2f9f37bedd7d94a11197c25c5caa4a413bfdb3f3
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 22 Apr 2014 12:29:26 +0800
Tag:    v2.5.6

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

commit 79040c7534e338a2f50255d2225f1cc7d7281783
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 22 Apr 2014 12:28:54 +0800
Tag:    v2.6.3

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

commit 04b0ce956d9b99aa01f0c445caa71c0907ada59a
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 22 Apr 2014 12:27:13 +0800
Tag:    v2.7.0-rc1

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

commit 9ff40d83b57d5ef98fdcbab703087b4ba7058c99
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 22 Apr 2014 12:26:24 +0800
Tag:    v2.7.0-rc1

Merge branch 'w17_MDL-41185_m27_courselog' of git://github.com/skodak/moodle

commit c18c7869faef1b1e4fffbd520e61aea0a2656c2e
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 17 Apr 2014 15:57:03 +0800
Tag:    v2.7.0-rc1

Merge branch 'w16_MDL-45144_m27_booklog' of git://github.com/skodak/moodle

commit 5bbc92e19c953a3a82406d246a4218b26819e061
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 17 Apr 2014 15:06:09 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-44658' of git://github.com/danielneis/moodle

commit 0b10dfce9d7d8cbc79072cd8b420b805779fe4d7
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 17 Apr 2014 11:20:51 +0800
Tag:    v2.7.0-rc1

Merge branch 'w16_MDL-41101_m27_assign' of git://github.com/skodak/moodle

commit 127daca011f9ae5843a8507ba0b37c29bc71791d
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 17 Apr 2014 11:04:26 +0800
Tag:    v2.7.0-rc1

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

commit 2d6221b2aec2ae54e5c94a933b3b17ac3bfc0a3b
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 17 Apr 2014 11:04:10 +0800
Tag:    v2.7.0-rc1

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

commit 8416d5526153c4ff66e2a73a61fcd071ac0bc7b7
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 17 Apr 2014 11:03:52 +0800
Tag:    v2.7.0-rc1

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

commit c5b027629fb179fbc5cb4b024fe5e15360dfe35b
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 17 Apr 2014 11:03:25 +0800
Tag:    v2.7.0-rc1

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

commit 354aca95f4d747e0f219afc7d0c345cbfa59a901
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 17 Apr 2014 11:01:16 +0800
Tag:    v2.7.0-rc1

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

commit 65b84ebe7d4b382e6cd174cec2a650164b0dbbac
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 16 Apr 2014 14:45:00 +0800
Tag:    v2.6.3

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

commit 09e1805072b4b91870fb13ee176e064cac73ced7
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 16 Apr 2014 14:44:04 +0800
Tag:    v2.7.0-rc1

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

commit 8b611b8e86a9c697ae2a6d27018d7fd67b269bb5
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 16 Apr 2014 14:42:40 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-41286_master' of git://github.com/markn86/moodle

commit 2522b260e664f7e431c6d650a913aac24411e792
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 16 Apr 2014 14:42:15 +0800
Tag:    v2.7.0-rc1

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

commit 179a0809ae1684c8985615a83a637935d930ef6b
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 16 Apr 2014 11:52:33 +0800
Tag:    v2.5.6

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

commit 29088f4bf52449a3a46ec0387ceed3fe3b0209e6
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 16 Apr 2014 11:52:16 +0800
Tag:    v2.6.3

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

commit 8662cd767ef7806f550c60577f7d95a882317abb
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 16 Apr 2014 11:51:57 +0800
Tag:    v2.7.0-rc1

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

commit 2e68bf6136b3e336a3caba7b648e0bfa4d3d3061
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 15 Apr 2014 17:55:30 +0800
Tag:    v2.7.0-rc1

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

commit 28ff871c4af731575ea1635bf071ee01003ec2ab
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 15 Apr 2014 14:34:48 +0800
Tag:    v2.6.3

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

commit c73340163485d5b969893a219470bdf684435b8d
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 15 Apr 2014 14:34:36 +0800
Tag:    v2.7.0-rc1

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

commit fdb8bae241f4c9a63e99808c9b036064917b9587
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 15 Apr 2014 14:34:28 +0800
Tag:    v2.7.0-rc1

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

commit 72f5bfc22b17164c5a8bfc85bd676d1c8b10cba3
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 14 Apr 2014 17:10:31 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-45047-module-notation-deprecated' of git://github.com/mudrd8mz/moodle

commit dd5e6ad03a79c2704777a1f6ec54c4d5d46aa7cf
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 14 Apr 2014 17:10:02 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-45057_master' of git://github.com/markn86/moodle

commit 300735e95eab7386e56c0e06f7f787c5d134dc0d
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 14 Apr 2014 17:09:49 +0800
Tag:    v2.7.0-rc1

Merge branch 'w16_MDL-44911_m27_unknownevent' of git://github.com/skodak/moodle

commit 47a1315f02e4236208c1a973fb7f87ede2954bf6
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 09 Apr 2014 09:48:41 +0800
Tag:    v2.7.0-beta

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

commit d175d25adc14cb4a30afda970aa556214fec2922
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Apr 2014 16:55:49 +0800
Tag:    v2.7.0-beta

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

commit 4842f37df590e39cecc5b45839b7198106332aea
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Apr 2014 11:16:08 +0800
Tag:    v2.5.6

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

commit 6520c5362bd656c367ab012e5c4ee10ad4952804
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Apr 2014 11:15:39 +0800
Tag:    v2.6.3

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

commit 39b70b23b72d66b8d86aa17557a9217d88e97388
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Apr 2014 11:14:52 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44677_scorm_commit' of git://github.com/davosmith/moodle

commit 593fc9d8d674078c066343ba10acf4c966d612bb
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Apr 2014 11:13:43 +0800
Tag:    v2.7.0-beta

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

commit aaba0d56e2c0831737112abafb5dfcb36afd7250
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Apr 2014 11:13:17 +0800
Tag:    v2.7.0-beta

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

commit af5f239548c1b2a657599605f13a0159ea4f2941
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Apr 2014 08:54:39 +0800
Tag:    v2.5.6

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

commit 1ec21eb0cdd3469aa2e2ccd72b8a8e28992f5e9e
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Apr 2014 08:54:27 +0800
Tag:    v2.6.3

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

commit 87618534eb5b16c2e2fd13dbe7ad299f764644dd
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Apr 2014 08:54:14 +0800
Tag:    v2.6.3

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

commit 72c0f16889f5bb7d395ce0fd19b5e03af99ec800
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Apr 2014 08:53:58 +0800
Tag:    v2.7.0-beta

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

commit 08cf1d787eb271a868b667c0cff64ea818f67190
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Apr 2014 08:53:49 +0800
Tag:    v2.7.0-beta

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

commit 0f4fc5a87852f3e99e185bdefbeb92dd915175bc
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Apr 2014 08:53:35 +0800
Tag:    v2.7.0-beta

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

commit efa6ee356bd169717675f967a71828c126f13b12
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Apr 2014 08:34:24 +0800
Tag:    v2.7.0-beta

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

commit fce220eb97ef7471bc5719db73184d658f4a3ee5
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 07 Apr 2014 16:16:47 +0800
Tag:    v2.6.3

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

commit a8e4b006ced9ae5f45ed8d3508b0723b9025b75f
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 07 Apr 2014 16:16:32 +0800
Tag:    v2.7.0-beta

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

commit 502ff062a07cc59b8e7bc1c944da350a233ab23c
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 07 Apr 2014 16:16:25 +0800
Tag:    v2.7.0-beta

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

commit bc348632e1652402ba4061c6aa4873a6905c8a1f
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 02 Apr 2014 14:57:40 +0800
Tag:    v2.7.0-beta

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

commit ac32e4282776f32d184d05e773722f5f95f84364
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 02 Apr 2014 14:54:59 +0800
Tag:    v2.7.0-beta

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

commit a5af7087db4d0bca954d1a2a14d3d5befcf4e221
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 02 Apr 2014 09:56:46 +0800
Tag:    v2.7.0-beta

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

commit 52d88560e1816e6379c1cc6de9a084d1a6c2ae80
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 02 Apr 2014 09:47:02 +0800
Tag:    v2.5.6

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

commit e0f47ce98c9abe92be2d0c7336ab383d318faecb
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 02 Apr 2014 09:46:50 +0800
Tag:    v2.6.3

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

commit 0123472c87de1e62a178b5458584883e289e1e42
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 02 Apr 2014 09:46:35 +0800
Tag:    v2.7.0-beta

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

commit 1db4576ef7b0562c9205c62ab15a6f88f5947a30
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 02 Apr 2014 09:16:50 +0800
Tag:    v2.5.6

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

commit 7b5cd3154d8573ae6c6a1917bb4474c25cde2854
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 02 Apr 2014 09:16:26 +0800
Tag:    v2.6.3

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

commit cc7c745c7d58b4620eace94ed26df6297b0c56ab
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 02 Apr 2014 09:15:33 +0800
Tag:    v2.7.0-beta

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

commit 70dc247627ba6f70533a3e968a835e50dde891a4
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 17:41:31 +0800
Tag:    v2.5.6

Merge branch '25STABLE-wip-MDL44021' of git://github.com/jennymgray/moodle into MOODLE_25_STABLE

commit 4c0e7741c3b81cd1be89f3c317c0dbb0baf37ea3
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 17:40:57 +0800
Tag:    v2.6.3

Merge branch '26STABLE-wip-MDL44021' of git://github.com/jennymgray/moodle into MOODLE_26_STABLE

commit b3d75528defa2f9d4b8fa1d54ec62a204241c82a
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 17:40:35 +0800
Tag:    v2.7.0-beta

Merge branch 'w14_MDL-40910_m27_usergraded' of git://github.com/skodak/moodle

commit e3e9701113f42c9bdae6026c590f7a7fe87ed3ca
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 17:40:22 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-MDL44021' of git://github.com/jennymgray/moodle

commit 5bb81ad437d08d69b69653091d1750c3a9bfe700
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 15:50:14 +0800
Tag:    v2.7.0-beta

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

commit 1a1049990f42df2ad9e874b88d90793ad0878183
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 15:42:21 +0800
Tag:    v2.7.0-beta

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

commit 99342b5197784c482d6ab86c4f1304def08bffb6
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 15:35:05 +0800
Tag:    v2.7.0-beta

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

commit 7fff0290ebb63156540cb37bac4e7e0053ea4485
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 15:34:44 +0800
Tag:    v2.7.0-beta

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

commit 9632cad16b6a593ab0f613b9460a496ad2b5da94
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 15:34:28 +0800
Tag:    v2.7.0-beta

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

commit df1f81e3ec1071617b302c4648af79f1c4b49ac1
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 15:34:08 +0800
Tag:    v2.5.6

Merge branch 'W14_MDL-44862_m25_pgsocket' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 0cbcd72e8f2ef662267035148e726be2af0e0f8b
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 15:33:54 +0800
Tag:    v2.6.3

Merge branch 'W14_MDL-44862_m26_pgsocket' of git://github.com/skodak/moodle into MOODLE_26_STABLE

commit 9746748e04112381a9ab2481f07233da14d39726
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 15:33:38 +0800
Tag:    v2.7.0-beta

Merge branch 'W14_MDL-44862_m27_pgsocket' of git://github.com/skodak/moodle

commit 3accdbff6017c0c290655ae45ee8aa9ed0a60747
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 14:44:13 +0800
Tag:    v2.7.0-beta

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

commit 0a4af310fd8865626d107ef04ee587dae9819625
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 14:43:49 +0800
Tag:    v2.7.0-beta

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

commit e50a6fa5fb63a89705af484e1f91df1f73f9fc2e
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 14:26:08 +0800
Tag:    v2.7.0-beta

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

commit 0b5f5231645eaeb3b2073a053c1a8fbe8211b25f
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 14:24:54 +0800
Tag:    v2.7.0-beta

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

commit d19792d5dea6ae0bb9ddaddc358a392ee2a161b2
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 13:52:52 +0800
Tag:    v2.6.3

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

commit 75823325d333ee637137e2c213291a2980da190c
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 13:51:09 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44746_master' of git://github.com/markn86/moodle

commit 0b1afc71bb5b2dcad9fdaf57463d07762844442a
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 13:45:59 +0800
Tag:    v2.7.0-beta

Merge branch 'w14_MDL-44715_m27_eventval' of git://github.com/skodak/moodle

commit 2f7949cd575b85da436ba9c64b7d0c62c7351274
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 13:32:03 +0800
Tag:    v2.7.0-beta

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

commit 902eec06e951740260a22c0fe861f0e5db13e0b8
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 13:24:09 +0800
Tag:    v2.7.0-beta

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

commit 814f40ba310508e5f2c73b4f921f100975a4cdf1
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 11:19:26 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44763_preview_int' of https://github.com/andyjdavis/moodle

commit d767af7c2d9811700dc30ffb37b1d731531d3b79
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 11:08:40 +0800
Tag:    v2.7.0-beta

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

commit 511fda4596e99a96ce07c71c30bb5f79e7a984a6
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 11:07:13 +0800
Tag:    v2.5.6

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

commit 3b7b097f2acf66c8b304f4d3779ecb8da105a5f2
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 11:06:48 +0800
Tag:    v2.6.3

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

commit e57f83a5c01c07682739c885b73fc88d2fe95e95
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 11:06:23 +0800
Tag:    v2.7.0-beta

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

commit c08890750c85dd207e0232b72dd7b57d9f79b9b8
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 11:06:01 +0800
Tag:    v2.5.6

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

commit 1a0bc77645e18cca61c760eab06b5d9b54320dd3
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 11:05:45 +0800
Tag:    v2.6.3

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

commit 502abeebb6d54758829a02d03d4cd8d2820fdb08
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 11:05:31 +0800
Tag:    v2.7.0-beta

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

commit 37de06026348fec3355a5fc31ed237aba7cfd5d0
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 11:05:09 +0800
Tag:    v2.6.3

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

commit 31374d59d0c0f1e038eaa4c9760c3a57b4fbcbbc
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 11:04:52 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44590-master' of git://github.com/danpoltawski/moodle

commit b3aed4e5aa114dbbeb572cba7581f7b63d404470
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 10:40:07 +0800
Tag:    v2.6.3

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

commit 5259d5131767901ae26cdc4019861148372bf5d6
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 10:39:24 +0800
Tag:    v2.7.0-beta

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

commit ea3d172274bc47e50d8b776fe6556ed0838f8fec
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 10:37:56 +0800
Tag:    v2.6.3

Merge branch 'wip_MDL-44854_M26' of git://github.com/gjb2048/moodle into MOODLE_26_STABLE

commit 1bc60971b1ee4d5a87023a8722bee862ed3f35a0
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 10:37:22 +0800
Tag:    v2.7.0-beta

Merge branch 'wip_MDL-44854_master' of git://github.com/gjb2048/moodle

commit cc247afe186814c4025b0ebd2f5516a0cd33f17a
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 10:36:39 +0800
Tag:    v2.6.3

Merge branch 'wip-MDL-44850_M26' of git://github.com/gjb2048/moodle into MOODLE_26_STABLE

commit 771b121287d091a44f2a14278cf28309aa460425
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 10:36:00 +0800
Tag:    v2.7.0-beta

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

commit 0cbc523621437051b3475fcdcef813c78a49b962
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 31 Mar 2014 16:36:27 +0800
Tag:    v2.7.0-beta

Merge branch 'w14_MDL-44733_m27_taskdisabled' of git://github.com/skodak/moodle

commit de19c44c82ae54ef20a5236da2d54cdd4bc58299
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 31 Mar 2014 16:36:12 +0800
Tag:    v2.7.0-beta

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

commit b13f4e8e7cf7f8fed9036d7b01be9e736fc8a1a0
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 31 Mar 2014 15:55:29 +0800
Tag:    v2.7.0-beta

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

commit 26a44fc7bb5271e28b85103ee67413c5804f29b0
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 31 Mar 2014 12:47:14 +0800
Tag:    v2.6.3

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

commit 7e1288f847ef195bd428e3e4226322918c6d6376
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 31 Mar 2014 12:46:21 +0800
Tag:    v2.7.0-beta

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

commit c531e2e632e389ad3740f390e2cf8e05eb5b0735
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 31 Mar 2014 11:03:31 +0800
Tag:    v2.7.0-beta

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

commit 6f29595ebaa85b8c9eb72ef7c49d5f5e6f257fd1
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 27 Mar 2014 16:52:19 +0800
Tag:    v2.6.3

Merge branch 'install_26_STABLE' of git://git.moodle.org/moodle-install into MOODLE_26_STABLE

commit db0b8a91e8db3c8de916235c8141c580bd314c11
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 27 Mar 2014 16:52:13 +0800
Tag:    v2.5.6

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

commit a5c3dec8e8f131703a5fb8d893668de7aa04dde3
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 27 Mar 2014 16:52:05 +0800
Tag:    v2.7.0-beta

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

commit f2bf88130db5c90252f1d3cf55a6e24fe917ee7e
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 26 Mar 2014 14:10:53 +0800
Tag:    v2.7.0-beta

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

commit a93c8266982d573fba1a3cc69e3bdb100dd154cf
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 26 Mar 2014 10:02:06 +0800
Tag:    v2.7.0-beta

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

commit 09bcedb39e7bf4741ceec5d7f6423b56b28d86ea
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 26 Mar 2014 10:01:06 +0800
Tag:    v2.7.0-beta

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

commit 66113ef0ef7646ff5aca546f7ba41263b3c72c50
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 25 Mar 2014 18:08:40 +0800
Tag:    v2.7.0-beta

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

commit daf7b64ef751147f9f851652437c4133d9872866
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 25 Mar 2014 17:10:27 +0800
Tag:    v2.7.0-beta

Merge branch 'w13_MDL-44107_m27_canview' of git://github.com/skodak/moodle

commit 0029497ca5d307f243bd31dc5f0230930349eb68
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 25 Mar 2014 16:49:14 +0800
Tag:    v2.7.0-beta

Merge branch 'w13_MDL-44732_m27_clitask' of git://github.com/skodak/moodle

commit da1a0bc3a99af7e9aa42289f2634a7685c2e129b
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 25 Mar 2014 16:49:01 +0800
Tag:    v2.7.0-beta

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

commit 3c3468107124956a92a1ab202bfbbf6131a6e98b
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 25 Mar 2014 16:21:52 +0800
Tag:    v2.5.6

Merge branch 'mdl44573-moodle25' of git://github.com/tlock/moodle into MOODLE_25_STABLE

commit 15ca2aede6b008ac2341317e99af227bdca0434e
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 25 Mar 2014 16:21:20 +0800
Tag:    v2.6.3

Merge branch 'mdl44573-moodle26' of git://github.com/tlock/moodle into MOODLE_26_STABLE

commit d43556a63fc252f3cdd90e44ad0b1403b106351f
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 25 Mar 2014 16:20:37 +0800
Tag:    v2.7.0-beta

Merge branch 'mdl44573-master' of git://github.com/tlock/moodle

commit c5ff2a76e19f12ca696c3fba60cd8c5b159fbfe0
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 25 Mar 2014 16:19:33 +0800
Tag:    v2.7.0-beta

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

commit e9e3431ad9d5efe968a53e76b6088e15bf1f62be
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 25 Mar 2014 16:18:28 +0800
Tag:    v2.7.0-beta

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

commit c047d164741d17892e63b044f9b83e708fd9dd09
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 25 Mar 2014 14:29:49 +0800
Tag:    v2.5.6

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

commit 0f10b86557bff36ff759efbf2bdcfe7f236a0eb6
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 25 Mar 2014 14:29:23 +0800
Tag:    v2.6.3

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

commit 2bcb6dbeb02aa38767a2a0ca78550ca254f9537e
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 25 Mar 2014 14:28:55 +0800
Tag:    v2.7.0-beta

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

commit 3f4a4daa036250774fd39aa81b1c05e27e13e404
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 25 Mar 2014 14:28:10 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44704_master' of git://github.com/markn86/moodle

commit 390f3c6ade968e4f66a4c1497a4a4b4fea8c26b7
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 25 Mar 2014 14:27:42 +0800
Tag:    v2.7.0-beta

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

commit dd043de942ad1f8313a8462fb7cc66fe859097fd
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 25 Mar 2014 14:15:19 +0800
Tag:    v2.7.0-beta

Merge branch 'w13_MDL-44106_m27_requestorig' of git://github.com/skodak/moodle

commit 19b4e349414e8915873e1c3dee4198ece72aada1
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 25 Mar 2014 14:06:41 +0800
Tag:    v2.7.0-beta

Merge branch 'w13_MDL-41284_m27_stats' of git://github.com/skodak/moodle

commit 81e50a3661a5b10a20f7d38d6080cd1aa3e33e6d
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 25 Mar 2014 14:03:06 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44316_master' of git://github.com/markn86/moodle

commit d11302b64673a72ba973eb45fb9c0e66e334d527
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 24 Mar 2014 17:27:41 +0800
Tag:    v2.7.0-beta

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

commit 66cb56ade6ae329a976c43b55d193dbbe86dc749
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 24 Mar 2014 17:02:10 +0800
Tag:    v2.7.0-beta

Merge branch 'w13_MDL-44639_m27_taskdocs' of git://github.com/skodak/moodle

commit 0b536b368ceaf57d0f2ce05da73956a01430c1bb
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 24 Mar 2014 15:38:58 +0800
Tag:    v2.7.0-beta

Merge branch 'w13_MDL-44661_m27_anon' of git://github.com/skodak/moodle

commit 5cff835bd677e8c16de00d6e8039c65965d3981c
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 19 Mar 2014 15:54:07 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-42892-master_42890' of git://github.com/ankitagarwal/moodle

commit c7d46f034cf432718ac98a4e2a99e7cae12d2891
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 19 Mar 2014 10:36:07 +0800
Tag:    v2.5.6

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

commit 140caa5b67afb686d5b73b046ea2d8358e908dd9
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 19 Mar 2014 10:35:44 +0800
Tag:    v2.6.3

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

commit 4158a6f5edf76756649e60aa12dfea31ef997ee9
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 19 Mar 2014 10:22:09 +0800
Tag:    v2.7.0-beta

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

commit e8aa64fc906bad738985311275f329bb4ffe17ad
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 19 Mar 2014 09:57:02 +0800
Tag:    v2.5.6

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

commit c21f8f13e504e4b280709b3ab69b705360949e07
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 19 Mar 2014 09:50:11 +0800
Tag:    v2.6.3

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

commit 4826ed1177c0d4c3d18b41525d6088150081a655
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 19 Mar 2014 09:49:00 +0800
Tag:    v2.7.0-beta

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

commit efd727063fbacc73eeae4b3218b56253607513e4
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Mar 2014 18:00:42 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-42892-master_42890' of git://github.com/ankitagarwal/moodle

commit b0eeaaacfec3ba8e915bf7aa2fefa8b0b2e16b44
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Mar 2014 17:41:00 +0800
Tag:    v2.5.6

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

commit d64521fec2d9ab4ede46145bee592e03b50c3fa2
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Mar 2014 17:40:09 +0800
Tag:    v2.6.3

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

commit aa1f1b75fbff0d8315bd24f2638dbf4ff12e58fa
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Mar 2014 17:39:40 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-38636-master' of git://github.com/roelmann/moodle

commit 5f2a9a89621d84b57d9c394d4065d8d1caaa3e32
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Mar 2014 16:04:49 +0800
Tag:    v2.5.6

Merge branch 'w12_MDL-44191_m25_mysql56' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 2aacf70ebd773105bd8c7f7447fb5eb80977807b
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Mar 2014 16:04:16 +0800
Tag:    v2.6.3

Merge branch 'w12_MDL-44191_m26_mysql56' of git://github.com/skodak/moodle into MOODLE_26_STABLE

commit 3aa71904a1eac84f8e6e506861be796eaf118371
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Mar 2014 16:03:47 +0800
Tag:    v2.7.0-beta

Merge branch 'w12_MDL-44191_m27_mysql56' of git://github.com/skodak/moodle

commit 7c671ddb9c2363793e735dbec3f7cab224a289bd
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Mar 2014 15:33:43 +0800
Tag:    v2.5.6

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

commit 99c8dbc2dd65abaf406102324ce93b0a74aa98fe
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Mar 2014 15:33:20 +0800
Tag:    v2.6.3

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

commit d9a23f9dd83bdf11cf722bac20317e9c306af81e
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Mar 2014 14:46:53 +0800
Tag:    v2.5.6

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

commit 7e0af0cdd54abba73d5acf90251fa926fef65929
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Mar 2014 14:46:25 +0800
Tag:    v2.6.3

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

commit 5a2286423498810a4ab60093a5689a87cce4f6fe
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Mar 2014 14:45:55 +0800
Tag:    v2.7.0-beta

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

commit 1bd20a2402fbc3e500f9a6c6da9e94b32844c8ad
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Mar 2014 14:34:18 +0800
Tag:    v2.5.6

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

commit cb470c3c706fdd1c7369ee190052d81980e0954e
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Mar 2014 14:33:42 +0800
Tag:    v2.6.3

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

commit 09f019ddb18601dc6e3499e183f6bad12449acc1
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Mar 2014 14:33:17 +0800
Tag:    v2.7.0-beta

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

commit fabc88f0bb510886c4fee4d3b547d2b14622f16c
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Mar 2014 13:52:45 +0800
Tag:    v2.7.0-beta

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

commit d2e55bfee49b785e0910561b4750b09b3cb788b4
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 18:19:57 +0800
Tag:    v2.5.6

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

commit 031d1e3f7d3919cb60f08049c0aace82e5a7e455
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 18:19:19 +0800
Tag:    v2.6.3

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

commit e65825830fcc1a39a4f7344b185d2acd3369e458
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 18:18:36 +0800
Tag:    v2.7.0-beta

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

commit 5f85fbc3e9a7ed677d9c4f8e1088991fbeb1edcb
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 18:13:28 +0800
Tag:    v2.5.6

Merge branch 'w12_MDL-44624_m25_dmltest' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 234e7b006639172c82806f712260b8470be2da3c
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 18:12:55 +0800
Tag:    v2.6.3

Merge branch 'w12_MDL-44624_m26_dmltest' of git://github.com/skodak/moodle into MOODLE_26_STABLE

commit ea406e6b94968964f2307038b2c75afc088a04a0
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 18:12:16 +0800
Tag:    v2.7.0-beta

Merge branch 'w12_MDL-44624_m27_dmltest' of git://github.com/skodak/moodle

commit 9051b7f4ea2c698ae16601998c98ad3007cd8391
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 18:08:57 +0800
Tag:    v2.7.0-beta

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

commit 3087d9d34eff279cc20e250fb314e7d698218007
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 17:53:00 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44650' of git://github.com/danielneis/moodle

commit 6f96d1a9a7618c53e180283464527768261c65f8
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 17:44:45 +0800
Tag:    v2.7.0-beta

Merge branch 'w12_MDL-41115_m27_emaillogin' of git://github.com/skodak/moodle

commit 122dcf40819fd6eb1af263e8ba1d8c432c19ef92
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 17:10:27 +0800
Tag:    v2.5.6

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

commit 682f0db9f6b8c5a8f1360ae5caace4abc71cc083
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 17:09:47 +0800
Tag:    v2.6.3

Merge branch 'MDL-44356-M26' of git://github.com/lazydaisy/moodle into MOODLE_26_STABLE

commit 9ceac20f74467e462853f651d2799372c1a0a53a
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 17:08:30 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44356-M27' of git://github.com/lazydaisy/moodle

commit 3a38900645956657ad3c5cb7e513b5093dd3165a
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 16:22:03 +0800
Tag:    v2.5.6

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

commit 322baf1570174f73fc6c3bdc02bd85520f57df13
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 16:21:33 +0800
Tag:    v2.6.3

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

commit c83a1da7d9b8dc22b0619f2a74b3da005f70207f
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 16:20:58 +0800
Tag:    v2.7.0-beta

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

commit 93eab4fd77bb09081ab1ae7cd1a5bcc4531db74c
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 16:03:08 +0800
Tag:    v2.7.0-beta

Merge branch 'w12_MDL-43604_m27_mariadb10' of git://github.com/skodak/moodle

commit 4715639b22a842242a09bf4ea127ded76b9c26a4
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 14:38:01 +0800
Tag:    v2.7.0-beta

Merge branch 'w12_MDL-44603_m27_extgrade2' of git://github.com/skodak/moodle

commit 992d71cd8f0cf7e022988a45a237710addf085e3
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 14:32:28 +0800
Tag:    v2.7.0-beta

Merge branch 'w12_MDL-44500_m27_eventcourse' of git://github.com/skodak/moodle

commit 784d9c2be0ffe2bf6b0cd3c07b06943d0d5b94f2
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 14:30:03 +0800
Tag:    v2.7.0-beta

Merge branch 'w12_MDL-44635_m27_ajaxlogs' of git://github.com/skodak/moodle

commit b28a4887f57b1a3b5cdc2ad03b6fa59434cb7f23
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 14:29:42 +0800
Tag:    v2.6.3

Merge branch 'w12_MDL-44635_m26_ajaxlogs' of git://github.com/skodak/moodle into MOODLE_26_STABLE

commit c02da6acc7218bd0dd8ee0cd23878718033f3d29
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 14:29:21 +0800
Tag:    v2.5.6

Merge branch 'w12_MDL-44635_m25_ajaxlogs' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 1cd64d12081adf5e652f1a2c5d315a114d830ca7
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 13:53:01 +0800
Tag:    v2.6.3

Merge branch 'w12_MDL-44339_m26_testdebug' of git://github.com/skodak/moodle into MOODLE_26_STABLE

commit 3b85de7b99954b100e08f13225ea1048ca7bf0ca
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 13:48:27 +0800
Tag:    v2.7.0-beta

Merge branch 'w12_MDL-44339_m27_testdebug' of git://github.com/skodak/moodle

commit b26329fd553fc3d7120b541f73226ac96893be9a
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 13:03:18 +0800
Tag:    v2.7.0-beta

Merge branch 'w12_MDL-44432_m27_logcron' of git://github.com/skodak/moodle

commit 72c9dda9fd820ca5610d5300755493033c89c231
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 11 Feb 2014 14:43:22 +0800
Tag:    v2.5.5

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

commit efdbd1bd1d21ff23b20f15f937edc7d9179fb30f
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 11 Feb 2014 14:42:59 +0800
Tag:    v2.6.2

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

commit c37c1c6c5d0eaec952f0e33d90498a5bf89c4af4
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 11 Feb 2014 14:42:23 +0800
Tag:    v2.7.0-beta

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

commit 7480dbc5f2e7e4fc9cccafe387550c85cf2eb5a6
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 11 Feb 2014 14:13:39 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-42505-Feedback-Inappropriate-use-of-fieldset-tags-around-cancel-button' of git://github.com/michael-milette/moodle

commit 98c5ac43584f454162e9c2b4227585d0c73d97cf
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 10 Feb 2014 18:16:42 +0800
Tag:    v2.6.2

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

commit 396548fad465220bd5f7fd47ef095967bb5abe97
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 10 Feb 2014 18:15:57 +0800
Tag:    v2.7.0-beta

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

commit d977433b7a52112a99e0228200358711db4f0393
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 05 Feb 2014 15:58:42 +0800
Tag:    v2.5.5

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

commit 270cd5210369649cba600647136f640ee0b9969f
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 05 Feb 2014 15:57:21 +0800
Tag:    v2.6.2

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

commit 7f34b8e1351fed8476eb179c11d754997990727f
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 05 Feb 2014 15:56:30 +0800
Tag:    v2.7.0-beta

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

commit c71b7b7c4430594587557f9feaf1fb9755203e21
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 05 Feb 2014 12:49:02 +0800
Tag:    v2.7.0-beta

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

commit e5fd05a36838dba3fa722d442a7abe60b0dbd13c
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 04 Feb 2014 15:44:51 +0800
Tag:    v2.7.0-beta

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

commit ccb30e1f7b3ea70f16f4d94d40222618490bdc06
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 17:35:17 +0800
Tag:    v2.5.5

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

commit 8ded044775890a977a11ab74b84061f4ad4dd20b
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 17:34:57 +0800
Tag:    v2.6.2

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

commit 8621a0ece56830ad8aa31d941f53969c268da19c
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 17:34:20 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-41647' of git://github.com/apsdehal/moodle

commit 1038bbb275c41af61c904b56daf0464ee2e833fb
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 16:10:17 +0800
Tag:    v2.5.5

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

commit 839b58679dfdf76fd87544b449e1e5ee893ee5ea
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 16:09:37 +0800
Tag:    v2.6.2

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

commit 3ef6324aaa553a72c1acfe5185f6a7c312c4bc02
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 16:09:09 +0800
Tag:    v2.7.0-beta

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

commit 79efe4f22bb656bbe4814e473a2a7800c773792b
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 15:34:32 +0800
Tag:    v2.6.2

Merge branch 'w05_MDL-43905_m26_loginevents' of git://github.com/skodak/moodle into MOODLE_26_STABLE

commit c8e346f79940d836c9c6446023dcc236cd398757
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 15:17:18 +0800
Tag:    v2.7.0-beta

Merge branch 'w05_MDL-43905_m27_loginevents' of git://github.com/skodak/moodle

commit 18a28dde45f308c8d723e0451e56d04f80684d96
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 15:07:53 +0800
Tag:    v2.6.2

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

commit dc4bed906fcdbf586a01931470e710a47bebc77a
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 15:06:11 +0800
Tag:    v2.7.0-beta

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

commit 94776f1bfa88ae7a3f239dc31f929456006cea0c
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 14:54:11 +0800
Tag:    v2.6.2

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

commit 367465085be54f466cb88b2b9b383f6a847de2fa
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 14:53:45 +0800
Tag:    v2.7.0-beta

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

commit 8c3470e3ce5412063ee68e328055cfa7b8fe4899
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 13:52:11 +0800
Tag:    v2.5.5

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

commit 52b3120916b8b6fa9b22eafea15655dacbafebb3
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 13:43:50 +0800
Tag:    v2.6.2

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

commit 1b066c06c6fe9e7b2882317a6275962f17ef2f6c
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 13:42:23 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43440-master' of git://github.com/mr-russ/moodle

commit 814a6297ece88ebb1b5f67b1987e7d42c25d92d9
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 31 Jan 2014 14:11:18 +0800
Tag:    v2.6.2

Merge branch 'install_26_STABLE' of git://git.moodle.org/moodle-install into MOODLE_26_STABLE

commit c2a4d082a663064b017b471f63af33338904cb00
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 31 Jan 2014 14:11:15 +0800
Tag:    v2.5.5

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

commit 56ae2ba99bc7fbed689d351f72436c3bffe141f1
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 31 Jan 2014 14:11:11 +0800
Tag:    v2.7.0-beta

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

commit 7c4044a54f11df17f619487e6629bcc97ee533e3
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 29 Jan 2014 12:01:33 +0800
Tag:    v2.7.0-beta

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

commit 003638cb8d9e19b1bf17859f751a49d3dafe35c3
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 17 Dec 2013 13:44:36 +0800
Tag:    v2.4.8

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

commit f989165cb81d969c70c79fa55e47b02f02cd7777
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 17 Dec 2013 13:44:27 +0800
Tag:    v2.5.4

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

commit df1914d111b2778bb876641564f418bd618b2009
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 17 Dec 2013 13:37:42 +0800
Tag:    v2.6.1

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

commit 2280ad064da262e030b10c419be0838fbec15180
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 17 Dec 2013 13:37:19 +0800
Tag:    v2.7.0-beta

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

commit 6e39ee0c82530f7cd446d0ab72f52978e56854be
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 17 Dec 2013 13:36:00 +0800
Tag:    v2.6.1

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

commit 9cba0f89814ee30fc246f1fa384ddc3cc7864ed0
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 17 Dec 2013 13:35:31 +0800
Tag:    v2.7.0-beta

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

commit 6af74e102c515d090f057b97c9415fac780d9a1b
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 17 Dec 2013 08:24:46 +0800
Tag:    v2.4.8

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

commit 61f6209afa244fba5ae22c2cd2545da7b41c494f
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 17 Dec 2013 08:24:25 +0800
Tag:    v2.5.4

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

commit 20b9e5301013fc9278cac521415b61a0517b27e7
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 17 Dec 2013 08:24:08 +0800
Tag:    v2.6.1

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

commit f3de94d340ed006e4f0c2faea566446616e02b93
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 17 Dec 2013 08:23:43 +0800
Tag:    v2.7.0-beta

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

commit 5df656cadd71249ea9b20f428dbb0fec48c17706
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 16 Dec 2013 09:29:19 +0800
Tag:    v2.4.8

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

commit 0ce9ea0df024d0e08690781088dd5021646c9e00
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 16 Dec 2013 09:28:55 +0800
Tag:    v2.5.4

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

commit be7a37d442418312903283fd1b700fad1c4b12b8
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 16 Dec 2013 09:27:59 +0800
Tag:    v2.6.1

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

commit 2a73cfb011d7f04539a812baa133ef1556a2c0b6
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 16 Dec 2013 09:27:38 +0800
Tag:    v2.7.0-beta

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

commit 06805cb54f82267206edcf9dec8b831a3237df1a
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 12 Dec 2013 13:51:05 +0800
Tag:    v2.6.1

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

commit bdd5a6c5c21a79b3aed3120810875dd9542a409d
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 12 Dec 2013 13:49:56 +0800
Tag:    v2.7.0-beta

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

commit a2712209f9296b91d6f1e144b0f4b4044260953c
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 12 Dec 2013 12:40:22 +0800
Tag:    v2.5.4

Merge branch 'mucupdates25' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 26023575ba688747f182cdab03d08da9c05a9368
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 12 Dec 2013 12:39:51 +0800
Tag:    v2.6.1

Merge branch 'mucupdates26' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 10484ad5e452de946005869aa192c149fd308404
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 12 Dec 2013 12:39:14 +0800
Tag:    v2.7.0-beta

Merge branch 'mucupdates27' of https://github.com/skodak/moodle

commit 81ea8ce8b912d2d80b55a7ce4adc38923a8fcdda
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 11 Dec 2013 09:47:29 +0800
Tag:    v2.5.4

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

commit 856be66774be5162fdc31f6a2b43b75f49f5bfaf
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 11 Dec 2013 09:47:00 +0800
Tag:    v2.6.1

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

commit 939aedfe3073aa8532afa97b4df1d707b9dc74db
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 11 Dec 2013 09:46:14 +0800
Tag:    v2.7.0-beta

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

commit e6a3977d3ec6708ff5aded59cba7d6444861b168
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 11 Dec 2013 08:48:31 +0800
Tag:    v2.5.4

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

commit 8f3e0bf7a5ae85a78e9efe632b908733bcc6a2f7
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 12:20:22 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-37380-master' of git://github.com/danpoltawski/moodle

commit 9f2e956580fe7f459059860c0f86c324b5e6280c
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 12:16:08 +0800
Tag:    v2.6.1

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

commit b3e0bd5225757832db6d4a61f2a7d88e3de296cf
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 12:15:27 +0800
Tag:    v2.7.0-beta

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

commit 143c8e7489114103301b1b7a947a6846e422ef1a
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 11:48:25 +0800
Tag:    v2.4.8

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

commit 4bc1b2151e1fe9f7a04d760fa51c2f77ab84855d
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 11:47:52 +0800
Tag:    v2.6.1

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

commit 36d93b57e76476c889187ba16593f99d057c2ee1
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 11:47:20 +0800
Tag:    v2.5.4

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

commit e762d5a7f2b82d4bd0965c1229c5c3c51081e5df
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 11:47:08 +0800
Tag:    v2.7.0-beta

Merge branch 'm27_MDL-43082_IE9_Compat_View_SVG_Say_No' of https://github.com/scara/moodle

commit a98bdfa6685ac887f898934ed5025b313c0424dd
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 11:29:22 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-37517-master' of git://github.com/danpoltawski/moodle

commit 66a437aca83d5c89b6d9fb16e590c389c39ba30f
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 11:26:14 +0800
Tag:    v2.6.1

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

commit 3649bcfa21c5a9b5555d0b340946299ddde2ced1
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 11:25:24 +0800
Tag:    v2.7.0-beta

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

commit 10f476e3a5c5c3301fbc16c120f5b3693591dcb4
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 11:13:30 +0800
Tag:    v2.4.8

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

commit 930acdb3e99e871acd8eebb511dd01a0375d13ed
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 11:13:09 +0800
Tag:    v2.5.4

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

commit 3b70fdaaf34e343666c8a13f2caac2f4d8bad0c0
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 11:10:29 +0800
Tag:    v2.6.1

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

commit 2cbcf496c26055d2fec811ebd201a37d497a35e9
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 11:10:04 +0800
Tag:    v2.7.0-beta

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

commit 78392c426effdae8a91cab6af1904f31d100b632
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 10:57:39 +0800
Tag:    v2.5.4

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

commit 08f6d5de07da5548da661e8c570afd8f9197a2ff
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 10:57:20 +0800
Tag:    v2.6.1

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

commit 11ca8227b11ef3f674e6828de1cc2fbcd776484c
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 10:56:49 +0800
Tag:    v2.7.0-beta

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

commit 013620aad30d792f1d5dada90af198716c1c0fff
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 08:40:54 +0800
Tag:    v2.7.0-beta

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

commit cc2aca7c2397d821f48ab2c74e797590178e0eaa
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 15:56:15 +0800
Tag:    v2.6.1

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

commit 95971ae99ea950adc7e49b2a4e06513e5d53742d
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 15:54:53 +0800
Tag:    v2.7.0-beta

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

commit d66fe9c1aafa529d7eae430c9de55fc63ef01a00
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 15:46:36 +0800
Tag:    v2.6.1

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

commit 895d3050e0dc1e139d1a6a91a3f0430a213b2dce
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 15:45:27 +0800
Tag:    v2.7.0-beta

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

commit 53ca1f85fdd2a66d5c381286a731022e36e1d9f2
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 15:29:08 +0800
Tag:    v2.5.4

Merge branch 'w50_MDL-42973_m25_addonupd' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 6203fc19f204929d4afc64ce579d697c9fa17ed0
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 15:28:35 +0800
Tag:    v2.6.1

Merge branch 'w50_MDL-42973_m26_addonupd' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 645cd2fe77c37ad710cddb8d0761f53946e1f5ba
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 15:26:39 +0800
Tag:    v2.7.0-beta

Merge branch 'w50_MDL-42973_m27_addonupd' of https://github.com/skodak/moodle

commit 64c03072a944d21468f30fc5877b1db6a46d1ed9
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 14:50:53 +0800
Tag:    v2.6.1

Merge branch 'MDL-43092_M26' of git://github.com/lazydaisy/moodle into MOODLE_26_STABLE

commit 40d5757441a17241529aac600c14738c79999aa1
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 14:50:27 +0800
Tag:    v2.7.0-beta

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

commit 780dc00ce5b27dad111d1362e949917fd1ef1d89
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 13:15:59 +0800
Tag:    v2.6.1

Merge branch 'w50_MDL-43137_m26_openbasedir' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 98a89047fb7d47ebbc0e90f88519e8110afa3c26
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 13:15:21 +0800
Tag:    v2.7.0-beta

Merge branch 'w50_MDL-43137_m27_openbasedir' of https://github.com/skodak/moodle

commit c4bc56217270d515fa72d66d18330f57616fc7be
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 08:28:32 +0800
Tag:    v2.6.1

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

commit 9f973b7bae739f91e1c3eabe41a6e6a9c04491e9
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 08:28:03 +0800
Tag:    v2.7.0-beta

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

commit af76b176624ff5ecd4288c66c8a6ead6b536fb62
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 08:14:24 +0800
Tag:    v2.5.4

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

commit 3f189b5d493427670983eee2cd13fafbf239229e
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 08:13:16 +0800
Tag:    v2.7.0-beta

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

commit ada23f968ae4508d5515476d47029933faf52ec2
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 08:03:30 +0800
Tag:    v2.4.8

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

commit c5776576008e166b8659dc5c417193b022ff9e9b
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 20 Nov 2013 10:24:29 +0800
Tag:    v2.4.8

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

commit ccbd4e40c56fb15129ffb911636051729db0686d
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 20 Nov 2013 10:23:57 +0800
Tag:    v2.5.4

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

commit a99e1ad9ec5eb6bdbdaf364d5fd60c2e0d566690
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 20 Nov 2013 10:20:17 +0800
Tag:    v2.7.0-beta

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

commit 2b6344c1d079124507509d4a17ac4c4dda0fceaf
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 15 Nov 2013 14:27:50 +0800
Tag:    v2.6.0-rc1

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

commit 4c35937514a1bf0b8d234c1626cfaf7b86c77d22
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 13 Nov 2013 15:24:06 +0800
Tag:    v2.6.0-rc1

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

commit 1d2a7ef54f451bd53c524fae2fdc628ee75c2200
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 13 Nov 2013 12:43:44 +0800
Tag:    v2.6.0-rc1

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

commit 5268dbffefc24b3495162d21d95a3a6485ede270
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 13 Nov 2013 10:28:46 +0800
Tag:    v2.6.0-rc1

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

commit 61a9dd5cd949ddb035c6e0b8b7ed6401288b0782
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 13 Nov 2013 08:06:38 +0800
Tag:    v2.4.8

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

commit 96b5e3fc494367af7155bf5f175611788338a15e
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 13 Nov 2013 08:05:35 +0800
Tag:    v2.5.4

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

commit 930fbd0505a6fabff41c5107fdbbaa2b762ca1dd
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 13 Nov 2013 08:05:25 +0800
Tag:    v2.6.0-rc1

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

commit 63d05b24d9956931acc094d3a8797ccdbf0a8575
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Nov 2013 12:11:41 +0800
Tag:    v2.5.4

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

commit b6168f132bf3d2cbde38f6f26a7975f5026d1259
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Nov 2013 12:11:19 +0800
Tag:    v2.6.0-rc1

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

commit b544b09636ae66ac85078a56d3b76db6c2abe42b
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Nov 2013 12:00:57 +0800
Tag:    v2.6.0-rc1

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

commit 32ef8734a9d1a14ee9006af0df26f511ccbdadd6
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Nov 2013 11:50:08 +0800
Tag:    v2.4.8

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

commit 00be37804598c4025653a83e3f8ac2642bcef466
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Nov 2013 11:48:10 +0800
Tag:    v2.5.4

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

commit c7ef5970400ce381ed40333c7b8ed5f0cd56f729
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Nov 2013 11:47:54 +0800
Tag:    v2.6.0-rc1

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

commit 57c9bdb250c5c0e4f4346c6b4fb2a96243e6f3bb
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Nov 2013 10:34:01 +0800
Tag:    v2.6.0-rc1

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

commit ce20ddf41a3bdf41aaa962ac3c0587f138bf3afd
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Nov 2013 08:24:07 +0800
Tag:    v2.5.4

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

commit 82b211b6d0fca698446c3565105f1ee301468b60
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Nov 2013 08:23:51 +0800
Tag:    v2.6.0-rc1

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

commit c4ce365aa18ebf447d53b18356b30cbc1572e3b8
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 11 Nov 2013 18:48:39 +0800
Tag:    v2.6.0-rc1

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

commit 42d72f3297d4370e440380e713795e44456e4bad
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 11 Nov 2013 18:11:29 +0800
Tag:    v2.4.8

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

commit af19ff0d79c2f5b078dd8bb7cc6563afc3460e79
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 11 Nov 2013 18:11:08 +0800
Tag:    v2.5.4

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

commit 459dd27d3e14075ea65b42766b536ec7ff50b48b
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 11 Nov 2013 18:10:47 +0800
Tag:    v2.6.0-rc1

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

commit 40dd8899abc278cbf5530938f4fdcd473609d58b
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 11 Nov 2013 17:55:19 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42081-phpunitfix' of git://github.com/mouneyrac/moodle

commit b180048946ad0456828e4c2643e642722aa88999
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 11 Nov 2013 12:02:48 +0800
Tag:    v2.6.0-rc1

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

commit f1be232f68cc9a681b4e11cb064da74c2139a1a5
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 11 Nov 2013 12:02:01 +0800
Tag:    v2.6.0-rc1

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

commit 2e84b4b32374c1f49eb4c1388fc5d98373f6fa86
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 08 Nov 2013 13:37:55 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42775-master' of git://github.com/danpoltawski/moodle

commit 61d1e9c44dbfc3d1e35d9f8b266b49e4f02f4e18
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 08 Nov 2013 11:13:24 +0800
Tag:    v2.6.0-rc1

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

commit 9fec5cb3330321b62ac5aa21fb6d5d602d8803b0
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 08 Nov 2013 11:10:41 +0800
Tag:    v2.6.0-rc1

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

commit d1cfb36b59c36c47cc19e27c202ee91a24eca302
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 07 Nov 2013 16:31:52 +0800
Tag:    v2.6.0-rc1

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

commit cc58ba267d6ec19f47ffa6fa02a4e33b79fcb931
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 07 Nov 2013 14:17:42 +0800
Tag:    v2.6.0-rc1

Merge branch 'w46_MDL-42708_m26_mymobile' of https://github.com/skodak/moodle

commit 4c0e155433d86742bc00326d3fa946353ad63cae
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 07 Nov 2013 14:08:03 +0800
Tag:    v2.6.0-rc1

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

commit bc6f61fe9f43bc0025b8c0de3ad6cf1527df61cc
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 07 Nov 2013 13:31:39 +0800
Tag:    v2.4.7

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

commit a41b923702befd8621fe067481358db3fdd8228e
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 07 Nov 2013 13:31:22 +0800
Tag:    v2.5.3

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

commit afd765337ad0cb8bdccfae829bc325daa6b9e136
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 07 Nov 2013 13:31:01 +0800
Tag:    v2.6.0-rc1

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

commit 1dd53c7a5a8a45e8b193c4c46e46b5765265eb59
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 07 Nov 2013 12:06:38 +0800
Tag:    v2.6.0-rc1

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

commit ef14a8ffb4fdd7b1f96f3a3bfc6d6671b42b8601
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 07 Nov 2013 11:18:00 +0800
Tag:    v2.6.0-rc1

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

commit 27199cfce84610561d90ce33c71581df660fcac9
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 07 Nov 2013 09:59:36 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42696-collator' of git://github.com/mudrd8mz/moodle

commit bdb7c88635889bd84c1f0bf527e07699436f8a91
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 06 Nov 2013 14:18:38 +0800
Tag:    v2.6.0-rc1

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

commit 794f42d81d825de5a787ce5aeb4a497e5b37c057
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 06 Nov 2013 13:32:39 +0800
Tag:    v2.4.7

Merge branch 'MDL-42640-24' of https://github.com/colin-umn/moodle into MOODLE_24_STABLE

commit 36c9dadd675f29554e0507cb1c4ababcf3f19b81
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 06 Nov 2013 13:31:46 +0800
Tag:    v2.5.3

Merge branch 'MDL-42640-25' of https://github.com/colin-umn/moodle into MOODLE_25_STABLE

commit c32ba4e2fbd4737331db5eeca36419b21f32edd4
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 06 Nov 2013 12:52:03 +0800
Tag:    v2.6.0-rc1

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

commit 0f57d555a0b53b2ae26481811f5e2f2effda5b0d
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 06 Nov 2013 08:56:20 +0800
Tag:    v2.6.0-rc1

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

commit a43db075ffa3a5fe0bfee0e412401841b49310d9
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 06 Nov 2013 08:52:15 +0800
Tag:    v2.6.0-rc1

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

commit a78bb0cc831812d9963deb29f5b5bae473154d78
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 05 Nov 2013 14:45:38 +0800
Tag:    v2.4.7

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

commit 5636172729676070eb119066fdfe57c668fdf138
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 05 Nov 2013 14:45:13 +0800
Tag:    v2.5.3

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

commit 792eeb0053cd88beea44f91d569e2272dd55dff5
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 05 Nov 2013 14:44:53 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-40267-master' of git://github.com/danpoltawski/moodle

commit edf21f0c567f85d93776a5d54e048cbcb9ab241b
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 05 Nov 2013 14:13:38 +0800
Tag:    v2.6.0-rc1

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

commit e2fb6ffa24e8ede31ced4c5fa0b9f64bae11e53c
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 16:17:08 +0800
Tag:    v2.4.7

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

commit bdb51186d75efd7e2f319bf5b3126c83ffaffc31
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 16:16:44 +0800
Tag:    v2.5.3

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

commit 8be0ca758cecc56affe84dbdb6b5a2b24198340b
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 16:16:23 +0800
Tag:    v2.6.0-rc1

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

commit 9ea075bb322f9fd2c55dbc6db11bfad5c8d88789
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 14:28:34 +0800
Tag:    v2.4.7

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

commit a13c26eca36f747951e165199b50a1890cfbdb6b
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 14:28:15 +0800
Tag:    v2.5.3

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

commit 23f13c5304d96b43b2cb73545e9ac5e2e795cffa
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 14:27:57 +0800
Tag:    v2.6.0-rc1

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

commit 08839bbcb89c0d3ba97f06186f4c0e2e81870e59
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 14:23:31 +0800
Tag:    v2.4.7

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

commit 7b6142193d6f736c1edb2d184e97df386274875d
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 14:23:12 +0800
Tag:    v2.5.3

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

commit 197ab6efefdf2a95f272065372d6ece916d9bc23
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 14:22:45 +0800
Tag:    v2.6.0-rc1

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

commit abfdce235b8a94600d7194c789d4304d79408875
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 13:58:26 +0800
Tag:    v2.4.7

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

commit 01e7a7761958b70b34e0210058cf5c692893146a
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 13:58:11 +0800
Tag:    v2.5.3

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

commit abaaa8cdae7b7c014b95dcc2c30bdb350b711345
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 13:15:13 +0800
Tag:    v2.4.7

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

commit c82257cc8846241d7c506c09afb7e2025cd21392
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 13:14:57 +0800
Tag:    v2.5.3

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

commit 753ce05b8c813e2ad2f043a429b12a5f92a62382
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 13:14:35 +0800
Tag:    v2.6.0-rc1

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

commit ad5a1a5d48157189d19ab3be32deb56bdb0e0717
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 12:59:27 +0800
Tag:    v2.6.0-rc1

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

commit 78d877d40b687e5eb224e75be817c67e91473296
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 12:53:22 +0800
Tag:    v2.6.0-rc1

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

commit 9312fbe16e8d8a591a61e673921ac5a536b78d93
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 12:19:00 +0800
Tag:    v2.4.7

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

commit b981f1b84711de254208d2e5276f4243779e7ef9
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 12:16:43 +0800
Tag:    v2.5.3

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

commit feb09881fb4d3c9685b58a9ed6b5b29b74cc3c70
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 12:13:42 +0800
Tag:    v2.6.0-rc1

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

commit b3e58b7d0b097a4c3fe98eecacb0ef9a86aa569a
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 10:18:39 +0800
Tag:    v2.4.7

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

commit b5ba65ebf1255e361976d091a656986c80c33b98
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 10:18:15 +0800
Tag:    v2.5.3

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

commit f19aab15656a40d3130903f5022a8056c2ea2198
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 10:17:58 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42664-performance_measuring_filter_manager' of git://github.com/mudrd8mz/moodle

commit d0a91156ab4d49f90fc5d8641e224a6aedc5d695
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 09:52:15 +0800
Tag:    v2.6.0-rc1

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

commit df27570b934790384ebcfa1c70611d95070aa5b4
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 01 Nov 2013 10:23:30 +0800
Tag:    v2.6.0-rc1

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

commit 1637827d75aa7731343530e1a78e6755fe521ae0
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 01 Nov 2013 10:04:29 +0800
Tag:    v2.6.0-rc1

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

commit 35e903971bcc2c0ae8125f258b7e8474e21c9283
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 01 Nov 2013 09:42:17 +0800
Tag:    v2.6.0-rc1

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

commit 003a81ee111d4439a9832a1066e5950d14ed907c
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 01 Nov 2013 09:16:20 +0800
Tag:    v2.6.0-rc1

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

commit d2941e88088d1871be305ef90b7dc3e29b25c3ca
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 01 Nov 2013 08:07:47 +0800
Tag:    v2.6.0-rc1

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

commit f5b2c9f4af3873da61549b65e2f83ceb2ae64a9f
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 31 Oct 2013 19:53:44 +0800
Tag:    v2.6.0-rc1

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

commit accfa102fe218579a3aaaa675a67b7a175573638
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 31 Oct 2013 19:20:20 +0800
Tag:    v2.4.7

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

commit 27fa761b1992d056d82b0002cb7c340e21462756
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 31 Oct 2013 19:17:58 +0800
Tag:    v2.5.3

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

commit bbb430bf5e75950935995a13f7e3b4616cc2de80
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 31 Oct 2013 19:17:40 +0800
Tag:    v2.6.0-rc1

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

commit 91d309074f0c93ff81c41290c70f878ad91226d3
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 31 Oct 2013 18:17:28 +0800
Tag:    v2.4.7

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

commit 42863ec241420e212683eeabbabd8da991ed11c6
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 31 Oct 2013 18:17:08 +0800
Tag:    v2.5.3

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

commit 595d9876bbc9f3a86d2f791419db8888ce9ce113
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 31 Oct 2013 18:16:37 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-40971_M26' of git://github.com/lazydaisy/moodle

commit 609aa78de1dedc1c1255c276fbea5cc5d9bdbc7e
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 31 Oct 2013 13:00:16 +0800
Tag:    v2.5.3

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

commit 0219e54100140e931a0fdf9b61ff180ed5e9ade7
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 31 Oct 2013 12:59:54 +0800
Tag:    v2.6.0-rc1

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

commit b53c155276d42b50f00b6117467072ec879031da
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 31 Oct 2013 12:49:22 +0800
Tag:    v2.6.0-rc1

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

commit 5ea6d66e9f3f4f11969a70f49d09ef536bea0a91
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 28 Oct 2013 13:56:45 +0800
Tag:    v2.6.0-rc1

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

commit 10b44ec93d6b40a499327bf631e99d312b171a07
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 25 Oct 2013 13:16:31 +0800
Tag:    v2.6.0-rc1

Merge branch 'w43_MDL-42207_m26_messageformat' of https://github.com/skodak/moodle

commit a2f56679f9e010f2952677db32d659c4c8cbba7b
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 25 Oct 2013 11:56:31 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-31938-master' of git://github.com/danpoltawski/moodle

commit 94cc2c769cfa418c754d349246992586d5adf03c
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 24 Oct 2013 12:31:12 +0800
Tag:    v2.4.7

Merge branch 'MDL-35402_editor_rules_24' of git://github.com/davosmith/moodle into MOODLE_24_STABLE

commit a4b421c1fb8b06e4285ac52bcf1d541693b960f5
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 24 Oct 2013 12:29:57 +0800
Tag:    v2.5.3

Merge branch 'MDL-35402_editor_rules_25' of git://github.com/davosmith/moodle into MOODLE_25_STABLE

commit c7944a72b39e29046058125a77d2a1ef2c165cfc
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 24 Oct 2013 12:29:15 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-35402_editor_rules' of git://github.com/davosmith/moodle

commit b46fc7cefd955af0d0c658fc763ce078a98c4c0c
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 24 Oct 2013 11:15:39 +0800
Tag:    v2.5.3

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

commit 33c4c3a3633ce37f2ba9e0f5394def52251e1a94
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 24 Oct 2013 11:15:05 +0800
Tag:    v2.6.0-rc1

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

commit 90eb4ddd9a2285ebc60194c687f107200ad3e3d3
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Oct 2013 14:22:28 +0800
Tag:    v2.6.0-rc1

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

commit d82a3b9f7625558d21633470fd999e8ffa5f57b4
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Oct 2013 12:34:47 +0800
Tag:    v2.6.0-rc1

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

commit ab864f2c36b19db0863b7e4cfb401b106e07123d
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Oct 2013 10:59:50 +0800
Tag:    v2.6.0-rc1

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

commit 4f10bc6bb089809913d3609a21c37809d300a664
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Oct 2013 10:51:00 +0800
Tag:    v2.6.0-rc1

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

commit 63e77f410d1d6e3d2aee0b0070e43037fa2ede3b
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Oct 2013 10:11:13 +0800
Tag:    v2.6.0-rc1

Merge branch 'w43_MDL-42414_m26_rev' of https://github.com/skodak/moodle

commit c5df0a63bce27cf2509760dd7ad44baf47c931e2
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Oct 2013 08:43:23 +0800
Tag:    v2.6.0-rc1

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

commit f9c86035c9e97594205c65e646728385c41cbeb6
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Oct 2013 08:05:59 +0800
Tag:    v2.6.0-rc1

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

commit e2536570a30f0b296e13170955cce82c8ccd9298
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Oct 2013 07:18:47 +0800
Tag:    v2.4.7

Merge branch 'w43_MDL-37813_m24_filterall' of https://github.com/skodak/moodle into MOODLE_24_STABLE

commit 538e06f2b5ff424ee33edb39ffb4f711fa3e3dbf
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Oct 2013 07:17:58 +0800
Tag:    v2.5.3

Merge branch 'w43_MDL-37813_m25_filterall' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 295825feb6ebfebb3f8af047f7e6e1259936ce38
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Oct 2013 07:17:00 +0800
Tag:    v2.6.0-rc1

Merge branch 'w43_MDL-37813_m26_filterall' of https://github.com/skodak/moodle

commit a70c9434d7d9b812dece648eff577f6619b5cf13
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 22 Oct 2013 12:04:25 +0800
Tag:    v2.4.7

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

commit 265b16589dd75d45c99c97c9aa8d5f45d1715fa5
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 22 Oct 2013 12:04:12 +0800
Tag:    v2.5.3

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

commit a90e023b4a667ac0d4adf731a5bb02139f37917d
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 22 Oct 2013 12:03:28 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-26170_rss' of https://github.com/andyjdavis/moodle

commit f311ba2714994edf07db9646735c6fd8eb18118c
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 22 Oct 2013 11:35:09 +0800
Tag:    v2.4.7

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

commit b2108d99550f15f0499e466920dfda369e8bd09d
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 22 Oct 2013 11:34:53 +0800
Tag:    v2.5.3

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

commit 06032cd9280835c5dac7f383e25b275241519094
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 22 Oct 2013 11:09:05 +0800
Tag:    v2.4.7

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

commit 575ec94611f8fbec732a0d1a10e85dddfed1e692
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 22 Oct 2013 11:08:45 +0800
Tag:    v2.5.3

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

commit 8f9560091f173689ac11c2699db29b18e827de4e
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 22 Oct 2013 11:08:12 +0800
Tag:    v2.6.0-rc1

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

commit 83a3e35e566ad014ff3fc74a6eb5e4ce03aa6f68
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 22 Oct 2013 06:48:57 +0800
Tag:    v2.6.0-rc1

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

commit a322a0ab53aa4423a204a1ff587c54cfed2a3ae4
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 21 Oct 2013 13:00:53 +0800
Tag:    v2.4.7

Merge branch 'w43_MDL-42386_m24_etag' of https://github.com/skodak/moodle into MOODLE_24_STABLE

commit 10ae2a6d0e0b956140f552ae97918e91b1f6d22d
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 21 Oct 2013 13:00:27 +0800
Tag:    v2.5.3

Merge branch 'w43_MDL-42386_m25_etag' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit e4ffd3dc7b1ea54db262da3513fad74da2a9e91c
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 21 Oct 2013 12:58:51 +0800
Tag:    v2.6.0-rc1

Merge branch 'w43_MDL-42386_m26_etag' of https://github.com/skodak/moodle

commit d2ff78d1736a30a578e5281a03310f9fb140ba25
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 15 Oct 2013 11:11:58 +0800
Tag:    v2.4.7

Merge branch 'wip-MDL-42234-24' of git://github.com/abgreeve/moodle into MOODLE_24_STABLE

commit 071ac9ffddbd2d39a0dc6eb6dfdf1513082bd26f
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 15 Oct 2013 11:11:40 +0800
Tag:    v2.5.3

Merge branch 'wip-MDL-42234-25' of git://github.com/abgreeve/moodle into MOODLE_25_STABLE

commit e3d43f0d7340c44bf381382c9660d40f958a6bfd
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 15 Oct 2013 11:11:15 +0800
Tag:    v2.6.0-beta

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

commit 41a403cd143c06c3e6b9df655149cb2a791f5273
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 15 Oct 2013 10:19:30 +0800
Tag:    v2.6.0-beta

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

commit 38a5cc79f8ccfd13b46f4b538629eaa183244d10
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 15 Oct 2013 10:19:20 +0800
Tag:    v2.6.0-beta

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

commit 30fb3994553d7e9a2288e438f66cd6edb0915ab9
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 15 Oct 2013 09:10:34 +0800
Tag:    v2.6.0-beta

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

commit 1b7930fe4acf9dea8d9ae44b4fd541aaab7214c2
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 11 Oct 2013 10:32:14 +0800
Tag:    v2.6.0-beta

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

commit 7bd19d562dce619a3ec52974e1e7a3c418e0b28f
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 10 Oct 2013 09:53:27 +0800
Tag:    v2.4.7

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

commit dd70b2b84adf35e999ea72280e061508ac40d6cf
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 10 Oct 2013 09:53:04 +0800
Tag:    v2.5.3

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

commit 0965a9be10356a29c296ab79c90c244161fa1851
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 10 Oct 2013 09:52:28 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-37153_master' of https://github.com/pauln/moodle

commit 44cd0b03af518681065f74e7611fa695ddc93842
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 10 Oct 2013 08:23:06 +0800
Tag:    v2.6.0-beta

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

commit 9c5d6183d599a18295f85b5bd81bfa44f354468e
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 10 Oct 2013 08:12:35 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-42143-master' of git://github.com/danpoltawski/moodle

commit 9e4561b2f2b5600e131df13da9b57950cc88b3c4
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 10 Oct 2013 06:36:30 +0800
Tag:    v2.6.0-beta

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

commit b159b572078819f2a54867b1e0664b4efdb398e6
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Oct 2013 09:04:12 +0800
Tag:    v2.4.7

Merge branch 'MDL-25176_m24' of https://github.com/merrill-oakland/moodle into MOODLE_24_STABLE

commit 573ceb9459e96f72359a557fc09e3b71eb74305c
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Oct 2013 09:03:48 +0800
Tag:    v2.5.3

Merge branch 'MDL-25176_m25' of https://github.com/merrill-oakland/moodle into MOODLE_25_STABLE

commit 04a4de20e812c3bb15d76d8f76631e1a5a60bd53
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Oct 2013 09:03:15 +0800
Tag:    v2.6.0-beta

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

commit 10a8d3dd7c63e329974abf7b0fcaf1dca033ad26
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Oct 2013 08:52:39 +0800
Tag:    v2.6.0-beta

Merge branch 'w41_MDL-37717_m26_enrolwarn' of https://github.com/skodak/moodle

commit 1b87f313486dcdcd005f7fd109cb4c8d00828e1e
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 03 Oct 2013 16:10:31 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40829_mc' of https://github.com/rwijaya/moodle

commit 32e375bdcb29cb25a5cb808bbc6922af65ee56fd
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 03 Oct 2013 11:08:03 +0800
Tag:    v2.6.0-beta

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

commit d794391d8be0f07c91242d3b6627ed341d66f1a5
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 02 Oct 2013 15:27:03 +0800
Tag:    v2.6.0-beta

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

commit 3b06d7b22b01cb0df9d09537b4b65e569092985c
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 02 Oct 2013 15:01:12 +0800
Tag:    v2.6.0-beta

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

commit 0880a52c9a8a20203554da36df895b66cd1f4e02
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 02 Oct 2013 14:54:59 +0800
Tag:    v2.6.0-beta

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

commit a929e5e83d526702edc305ede5a6b99e2379c59a
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 02 Oct 2013 07:20:52 +0800
Tag:    v2.6.0-beta

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

commit d7788d69f63fced62782069e4680099c688417df
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Oct 2013 18:49:41 +0800
Tag:    v2.4.7

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

commit 31f1464297b8c278bd1ecb905a38d429d1f91137
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Oct 2013 18:49:29 +0800
Tag:    v2.5.3

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

commit c9e4ade71e83654e22de1cc4c687c26738a63c0b
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Oct 2013 18:49:03 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-32592-master' of git://github.com/danpoltawski/moodle

commit a033a6b4c1eb3a286e1fc92658d16a0a8fb851fe
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Oct 2013 18:44:07 +0800
Tag:    v2.4.7

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

commit e4f0750a1287e5185b87a41531ffccd7421683d2
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Oct 2013 18:43:25 +0800
Tag:    v2.5.3

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

commit 815f0ef33c935b11fd821c2e433730f3c1b7a270
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Oct 2013 18:42:37 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39653-master' of git://github.com/danpoltawski/moodle

commit 3a3e3fa3b5cbcefe4bee5762f6dc438a7054d3d2
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Oct 2013 12:45:14 +0800
Tag:    v2.6.0-beta

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

commit 5c06e84ab278fa9691f393a7cb4b566e4075bf5f
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Oct 2013 12:21:50 +0800
Tag:    v2.6.0-beta

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

commit f09ecc6d8bb022b2a2f19892420078b8ac909c0a
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Oct 2013 08:01:17 +0800
Tag:    v2.6.0-beta

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

commit 9e110593261c7664a95915dec156d5dc7689c12a
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 30 Sep 2013 16:04:38 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-12403-master' of git://github.com/danpoltawski/moodle

commit e6ec2366a8ee1a1db9c8447496d141a24bfe0391
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 30 Sep 2013 15:57:30 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41885-master' of git://github.com/danpoltawski/moodle

commit 29d526b49558968b263e5a1e0ac83b65bc4f0e29
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 30 Sep 2013 14:11:44 +0800
Tag:    v2.4.7

Merge branch 'MDL-41954-workshop-zero-variance_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE

commit d23f108197f1a24188ce7927825537c82a428ca4
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 30 Sep 2013 14:10:48 +0800
Tag:    v2.5.3

Merge branch 'MDL-41954-workshop-zero-variance_25' of git://github.com/mudrd8mz/moodle into MOODLE_25_STABLE

commit f13511451cb4e139e5d2755208f57f36f9b3a4f8
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 30 Sep 2013 14:09:40 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41954-workshop-zero-variance' of git://github.com/mudrd8mz/moodle

commit 9573950b9d7ba4d83edf79c54ce5ae6fe7aaa81a
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 27 Sep 2013 12:51:14 +0800
Tag:    v2.5.3

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

commit 06450ed3985fc21888c100a51eaddb16e6d3108a
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 27 Sep 2013 12:49:38 +0800
Tag:    v2.4.7

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

commit 093a6fe77fc39b06c804fbe4bfcac9834a52c966
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 25 Sep 2013 10:53:09 +0800
Tag:    v2.6.0-beta

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

commit 88a4cb473439f5a2875260368b92fac1bb808c12
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 25 Sep 2013 10:52:39 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41778_master' of https://github.com/nitzo/moodle

commit d0b63cbde580750e116d2c4b2832eda4ae0db907
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 25 Sep 2013 10:21:46 +0800
Tag:    v2.6.0-beta

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

commit e26e4b8a7b4ea734e754d6993c60cff362859fbe
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 25 Sep 2013 10:21:37 +0800
Tag:    v2.6.0-beta

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

commit 7375d9eb1fce0a6a1238cd2a8e8cc9d9e5bc67d0
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 25 Sep 2013 09:53:48 +0800
Tag:    v2.6.0-beta

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

commit dbad2a65ec2f128360ac10b27b302afb526eb033
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 25 Sep 2013 08:54:19 +0800
Tag:    v2.6.0-beta

Merge branch 'w39_MDL-41223_m26_customlogin' of https://github.com/skodak/moodle

commit 90336898da2ab4e84cc29d02af07ef7786f82be0
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Sep 2013 19:43:18 +0800
Tag:    v2.5.3

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

commit 0aab5cbc5921d27cc332af18c175c04339a0e95d
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Sep 2013 19:42:20 +0800
Tag:    v2.6.0-beta

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

commit 8492c192afbea22859a81eb6190da69efa8396d0
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Sep 2013 19:33:12 +0800
Tag:    v2.4.7

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

commit 0184a31bad4ab8e9599fe8da394e156b5f67a812
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Sep 2013 19:32:35 +0800
Tag:    v2.5.3

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

commit 4fa30a89470379458a14d62e5c2bfffcad9d8ac0
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Sep 2013 19:31:46 +0800
Tag:    v2.6.0-beta

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

commit 72f6cb3cd3b8789e470d6ac3234d67c97a347e49
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Sep 2013 18:00:24 +0800
Tag:    v2.6.0-beta

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

commit bdc7ff589d63804e854156196c922fd76582f946
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Sep 2013 14:49:50 +0800
Tag:    v2.6.0-beta

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

commit c484e97f45ca89c0d773e9347da14442fd20af2c
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Sep 2013 14:33:50 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41733_master' of git://github.com/StudiUM/moodle

commit 84128f46b2381fdfccd49d05dc761bbd4ddf43c3
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Sep 2013 14:29:00 +0800
Tag:    v2.6.0-beta

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

commit c925e4fa8e58052dcc8aed0a727eb5e7645042f3
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Sep 2013 09:49:02 +0800
Tag:    v2.6.0-beta

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

commit d9fd72feb5745b8121a1747bc8f10260a46e1c31
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Sep 2013 09:48:49 +0800
Tag:    v2.6.0-beta

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

commit b0124c9703280038b67ccc8c221c2bb1bada9ea2
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 23 Sep 2013 17:18:05 +0800
Tag:    v2.4.7

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

commit 1537f8241eb0b74bb63c32d6c0f13ac2e52ec49e
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 23 Sep 2013 17:17:34 +0800
Tag:    v2.5.3

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

commit cbbaffc7d3abeb970f4774e7b3b35eea73502e0f
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 23 Sep 2013 17:16:43 +0800
Tag:    v2.6.0-beta

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

commit 009e0d28ae714618447ad3e093f52b97bf29b6f0
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 23 Sep 2013 16:15:35 +0800
Tag:    v2.6.0-beta

Merge branch 'w39_MDL-37324_m26_phpmailer' of https://github.com/skodak/moodle

commit 3e36c789d7c5c90dbacf41d4391e20f57363c8e0
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 23 Sep 2013 12:48:10 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41311-master' of git://github.com/danpoltawski/moodle

commit 47ba8d481e4748065c11fe4fe376f326f746db57
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 23 Sep 2013 12:41:22 +0800
Tag:    v2.4.7

Merge branch 'wip-MDL-41772-24' of git://github.com/abgreeve/moodle into MOODLE_24_STABLE

commit 30f43b0e9cd1b44a681e2f6b447e997a360969c7
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 23 Sep 2013 12:40:35 +0800
Tag:    v2.5.3

Merge branch 'wip-MDL-41772-25' of git://github.com/abgreeve/moodle into MOODLE_25_STABLE

commit b4430713784ece8dc66387ed971ffe6b0e056a59
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 23 Sep 2013 12:39:45 +0800
Tag:    v2.6.0-beta

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

commit 2b7a557c28a1fb13eb0a510855a570fad8f5aa95
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 17 Sep 2013 14:43:12 +0800
Tag:    v2.6.0-beta

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

commit 9f21d248957f1ffe147a734ac0c37c126ac86db1
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 17 Sep 2013 09:10:44 +0800
Tag:    v2.6.0-beta

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

commit 4a91055f7c5973c8de37b03bac5ccaaf0588e6e1
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 17 Sep 2013 09:08:27 +0800
Tag:    v2.6.0-beta

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

commit 4ead3551439b95233f353a9bc8722a768a6dffd8
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 16 Sep 2013 15:14:18 +0800
Tag:    v2.6.0-beta

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

commit eca39eaeee431794148a2909cc1174268fe4f6a3
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 16 Sep 2013 13:32:45 +0800
Tag:    v2.5.3

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

commit 81673647a914bb7b5eb804fc609be7324a6f47b9
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 16 Sep 2013 13:31:20 +0800
Tag:    v2.6.0-beta

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

commit ac6fb0ad17b227cf2819e9c10f8a9209705927e3
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 21 Aug 2013 08:28:47 +0800
Tag:    v2.6.0-beta

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

commit e542bc26d924e9140e4fda4430a33c792b19bfbf
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 21 Aug 2013 08:02:41 +0800
Tag:    v2.6.0-beta

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

commit e7c21ac3be117577dd84cc3b79ba1709b5c41ce6
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 06 Aug 2013 22:16:53 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-41025-m26' of git://github.com/samhemelryk/moodle

commit 25b8ce92784b270ebd2c57e8d99cdc73c3665008
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 06 Aug 2013 22:10:44 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-41024-m26' of git://github.com/samhemelryk/moodle

commit 9be9b412b1aead4888523263bfacff2f8dbf249a
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 06 Aug 2013 20:53:19 +0800
Tag:    v2.6.0-beta

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

commit 18a4335366c03011f3ca6b6b873e11f18b4be7fd
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 06 Aug 2013 20:33:55 +0800
Tag:    v2.6.0-beta

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

commit 4b96f2ae62f78323817f829eb7070c90a4014b3e
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 06 Aug 2013 19:05:47 +0800
Tag:    v2.6.0-beta

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

commit e7328732e90ae059cb80b2de2600f3b7622bdc90
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 06 Aug 2013 18:49:13 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41034-essay-broken' of git://github.com/ktemkin/moodle

commit 0fb7a90363662ae4f83db19d8c8cccbae6905f1d
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 06 Aug 2013 13:03:26 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-37962_beep' of git://github.com/andyjdavis/moodle

commit b4b50810d4641546b3946e3b519ca20d1f9daeb2
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 06 Aug 2013 12:40:45 +0800
Tag:    v2.4.6

Merge branch 'MDL-31226-MOODLE_24_STABLE' of https://github.com/lucisgit/moodle into MOODLE_24_STABLE

commit 71699c5a8104100c0e667af82a4fad1f3064d388
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 06 Aug 2013 12:39:26 +0800
Tag:    v2.5.2

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

commit 87934924be2b35383982bcfaf41e4e566564de69
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 06 Aug 2013 12:38:08 +0800
Tag:    v2.6.0-beta

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

commit f0655ecb7132d8a033f3d2cc4ee6d2c01c38282a
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 06 Aug 2013 11:04:38 +0800
Tag:    v2.6.0-beta

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

commit 50c6e3ebac5c9966544a0928c06c9426f5af6f04
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 15:46:22 +0800
Tag:    v2.6.0-beta

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

commit 698be6bbd09079723e0590ce518480f533fb665b
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 15:42:09 +0800
Tag:    v2.6.0-beta

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

commit ebb5c53b514fb405c8a3f778a97475957f44da4a
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 15:17:33 +0800
Tag:    v2.4.6

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

commit 0b1723fd577ec2310cc5754a9ceaa007904833e9
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 15:16:47 +0800
Tag:    v2.5.2

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

commit fd6d13bab1de20e69b1cc44e06605ab5af6c353a
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 15:15:38 +0800
Tag:    v2.6.0-beta

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

commit 93334057de0d1a0a9870840b6b5333379e5bd880
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 11:53:35 +0800
Tag:    v2.4.6

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

commit 25dcfa6f5400a3b17139a746239be43535bd724c
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 11:52:38 +0800
Tag:    v2.5.2

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

commit f5472d1fd4bdda5f2d388684637746317e7397e9
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 11:49:55 +0800
Tag:    v2.6.0-beta

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

commit a4bd80565f42bc61dc6d9f580183473ba1c5e2b3
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 11:16:34 +0800
Tag:    v2.5.2

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

commit f64777a93f53f7ff57e8963480c05b07bfab73fd
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 11:15:25 +0800
Tag:    v2.6.0-beta

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

commit 153cb0b4c326cb0e125beb6a9e4787d1127d7082
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 10:31:53 +0800
Tag:    v2.5.2

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

commit 40e0dbd5ac217a124ae33ed18b104bdba9317051
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 10:30:56 +0800
Tag:    v2.6.0-beta

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

commit ac23d64400883163724c9e532418692d947cf2c8
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 10:21:56 +0800
Tag:    v2.4.6

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

commit 2adfb6528edaeb1db44e2bc2e212f4b9ab2bfbcd
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 10:20:40 +0800
Tag:    v2.5.2

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

commit e22e263fa04a89f0d3a6d41b3e0cd5334901b8d8
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 10:19:45 +0800
Tag:    v2.6.0-beta

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

commit e8a943e3610724214e40e511b268a1b11e6bec42
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 08:49:32 +0800
Tag:    v2.5.2

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

commit 98260b31a50c5533f39af435c8d8fa8d41153813
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 08:48:36 +0800
Tag:    v2.6.0-beta

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

commit 89478f00cdb1abe13c187c729ae7c2aea3958827
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 17 Jul 2013 10:47:43 +0800
Tag:    v2.4.6

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

commit d11977ebc91ba3fd7cb4bf75f72a85af03e5eea6
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 17 Jul 2013 10:46:26 +0800
Tag:    v2.5.2

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

commit 73f0d9b638b0dfe8ec1ccf1b8015942a62bbd7e2
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 17 Jul 2013 10:45:18 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40701-master' of git://github.com/danpoltawski/moodle

commit 576151c9870a5fa88911aa589bcf64513e385862
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 17 Jul 2013 09:09:08 +0800
Tag:    v2.6.0-beta

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

commit 3e2b5734dd0f5c3dfedad02e9bb539fb26e4cad5
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 16 Jul 2013 15:07:23 +0800
Tag:    v2.6.0-beta

Merge branch 'w29_MDL-40549_m26_oacleanup' of https://github.com/skodak/moodle

commit 18cf2255f0d85f9972c15c71505de52b52d7c4f4
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 16 Jul 2013 14:12:40 +0800
Tag:    v2.4.6

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

commit 996d7754571dce7937ed5d492c9350312890f77f
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 16 Jul 2013 14:11:29 +0800
Tag:    v2.5.2

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

commit b7361a9be7b35689c0c29fa3800469ee5a75e624
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 16 Jul 2013 14:10:13 +0800
Tag:    v2.6.0-beta

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

commit da4a51d096ff27f965f75c924af9d372fe393319
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 16 Jul 2013 12:33:24 +0800
Tag:    v2.5.2

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

commit e2abbde44e48b23f7025a5c710140bab03675ddc
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 16 Jul 2013 12:29:24 +0800
Tag:    v2.6.0-beta

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

commit 792e6059beb21d1090be71bfd3a20f0c6c4fdb25
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 16 Jul 2013 11:48:27 +0800
Tag:    v2.6.0-beta

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

commit ff2ca3ef3d00c25105ff544d3d98b322d7b8ee6d
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 16 Jul 2013 11:07:17 +0800
Tag:    v2.6.0-beta

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

commit 50d1d9949b03b6f238027f8eda3769aa78334ceb
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 16 Jul 2013 10:16:27 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-30740-master' of git://github.com/danpoltawski/moodle

commit 73221dbdfea3f395ebafbe39b4ef3a34b8839595
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 15 Jul 2013 15:28:59 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-28466-oldata-remove' of git://github.com/danpoltawski/moodle

commit 35dc874292e6b6a4dfe6f81d074cea20c7fe3ca6
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 15 Jul 2013 12:45:22 +0800
Tag:    v2.4.6

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

commit 2500fc57d0b1d037225183385dc9e22b652bf206
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 15 Jul 2013 12:44:22 +0800
Tag:    v2.5.2

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

commit 5710055d410dfc4154191bc41e630320b8396516
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 15 Jul 2013 12:41:55 +0800
Tag:    v2.6.0-beta

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

commit 3fd0ea3c1e8c78bdeefedba675053271c0a8b9d6
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 15 Jul 2013 11:07:37 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-28466-master' of git://github.com/danpoltawski/moodle

commit c291dd69ea467c7ae11d07b6580d5fc758dc62dd
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 15 Jul 2013 10:53:02 +0800
Tag:    v2.4.6

Merge branch 'wip-MDL-39062-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit eccf42d9d987e97fa3cd191ede59d0b4f31d8dec
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 15 Jul 2013 10:42:57 +0800
Tag:    v2.5.2

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

commit 918cc26541c25332d3e9470a6437290ceafa05f4
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 15 Jul 2013 10:40:46 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-39062-m26' of git://github.com/samhemelryk/moodle

commit 78eca0fc3c27addff9ae52bbeb9da2e444de9005
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 15 Jul 2013 10:25:23 +0800
Tag:    v2.6.0-beta

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

commit 51230ba88e441bbdebc0154698f879e62fdd940e
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 18:16:21 +0800
Tag:    v2.6.0-beta

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

commit 537d8f8a58d1b155d0fcbaa01c269b0a8f8f0afc
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 14:26:59 +0800
Tag:    v2.4.6

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

commit 63c8f25b1bea72379ec4c4a311f09c629fd4a7b0
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 14:25:38 +0800
Tag:    v2.5.2

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

commit cb88ffb6982c8e12ac225ac21168065bd7321f5a
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 14:22:38 +0800
Tag:    v2.6.0-beta

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

commit 06832223d4413fae2b965f9cc719f930779262ab
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 11:15:37 +0800
Tag:    v2.6.0-beta

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

commit 8d296ea5e4c6787efd10eff767780d8a5fbec575
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 10:05:16 +0800
Tag:    v2.3.9

Merge branch 'm23_MDL-39832_Fix_Chrome_Issues_ETag_XSendfile_2ndRound' of https://github.com/scara/moodle into MOODLE_23_STABLE

commit 114c924d9463719c2ff6ca151bd3c7fd178c9ec8
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 10:03:57 +0800
Tag:    v2.4.6

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

commit 0f2a0a3fb0c3cff4edbd3a8f759683a782df8a95
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 10:01:29 +0800
Tag:    v2.5.2

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

commit f8be9f9e739e7973108912b23fd0bfb9c51110b0
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 09:58:44 +0800
Tag:    v2.6.0-beta

Merge branch 'm26_MDL-39832_Fix_Chrome_Issues_ETag_XSendfile_2ndRound' of https://github.com/scara/moodle

commit 4d8ff7c8e27301a366954ba2fa271e45ad7f673b
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 09:09:44 +0800
Tag:    v2.5.2

Merge branch 'w28_MDL-40488_m25_admin' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 9de65fffb69cf2929dd3574cd2e47fe15b3dd074
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 09:08:49 +0800
Tag:    v2.6.0-beta

Merge branch 'w28_MDL-40488_m26_admin' of https://github.com/skodak/moodle

commit ed79029f0ecd2ba581b24dd42bbb1f3ca9301621
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 08:03:44 +0800
Tag:    v2.4.6

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

commit 512ab8e262ea094d88f21dad73c6b6fde375530c
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 08:02:53 +0800
Tag:    v2.5.2

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

commit 9100a8f4bb296a993a3eface3fea477d708c35c3
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 08:02:04 +0800
Tag:    v2.6.0-beta

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

commit 9a2188812dbe8b954f4a9c2b62d22f310db4ce1c
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 07:58:09 +0800
Tag:    v2.6.0-beta

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

commit 1b0951a26a24b7e872c17bb3b87f01952527f1a6
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Jul 2013 19:36:12 +0800
Tag:    v2.5.2

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

commit ed2896d990aea373315d76cb192f662475004281
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Jul 2013 19:34:49 +0800
Tag:    v2.6.0-beta

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

commit 73118a26876dd9f8cd3edc29747ad8e95d792e19
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Jul 2013 16:06:33 +0800
Tag:    v2.6.0-beta

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

commit 82043201ea9434a48177194dbe0b9b5e4d1e6fdd
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Jul 2013 14:34:28 +0800
Tag:    v2.5.2

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

commit f64998fab3e63a39f8a1a04ad5699bad84c97fd4
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Jul 2013 14:32:16 +0800
Tag:    v2.6.0-beta

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

commit 8bed37619e31de0ff09bcc1efb650fa95230cadc
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Jul 2013 13:55:51 +0800
Tag:    v2.6.0-beta

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

commit 84842f54dda9ba635db816b915b567a6cb662fa8
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Jul 2013 13:54:45 +0800
Tag:    v2.6.0-beta

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

commit be9cd2ff26135ea1de063d0c73938ba62f708573
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Jul 2013 09:33:20 +0800
Tag:    v2.4.6

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

commit 33025649f3292e14e99f32f71bc754fb7739b53e
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Jul 2013 09:31:52 +0800
Tag:    v2.5.2

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

commit b4a044f3fbcc7d6a13e8f3eb2aefb538d158657a
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Jul 2013 09:30:42 +0800
Tag:    v2.6.0-beta

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

commit 319b3293676e9fd4ab4f2cf0f7ff9598d9db3f8c
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 13:41:36 +0800
Tag:    v2.3.8

Merge branch 'MDL-40207-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit bebd6a6cef3701fbfbbfdf33c83d3ec8d95c37ee
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 13:39:55 +0800
Tag:    v2.4.5

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

commit 8526be5612f57b6b8a1984182ff4e7f5b15e6c86
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 13:38:20 +0800
Tag:    v2.5.1

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

commit da107ae4283923c47af46d561069a784162e266e
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 13:36:42 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40207-master' of git://github.com/danpoltawski/moodle

commit 272105604abe0098db0729dcb36b831f32cc81b1
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 12:13:10 +0800
Tag:    v2.4.5

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

commit 3ad26c86eb6185b93ccde89acfafbf6b1f99cffa
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 12:11:54 +0800
Tag:    v2.3.8

Merge branch 'MDL-39650-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 5883de26ae619925d978ce4d46f8426ae65f5f09
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 10:59:04 +0800
Tag:    v2.6.0-beta

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

commit 4d7c173514a63cba8acfb63feed89db9142cb829
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 10:57:06 +0800
Tag:    v2.5.1

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

commit 2e6cc99352bb278f176ea1db0fd58ad938253feb
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 10:56:20 +0800
Tag:    v2.4.5

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

commit ade9bbc32e162b4bf76a71c52cd591902cc09121
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 10:54:40 +0800
Tag:    v2.3.8

Merge branch 'MDL-40165-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE

commit 4b4ac86a373a35028fd711964c1ed6d43782ccfa
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 09:18:30 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-38079_master' of git://github.com/mr-russ/moodle

commit 30b38ce4fa3b41789e9475812db867497d30224e
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 09:15:54 +0800
Tag:    v2.3.8

Merge branch 'MDL-38079_23' of git://github.com/mr-russ/moodle into MOODLE_23_STABLE

commit af06f5def546ada7ed021b2af2858a7335d52c66
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 09:14:52 +0800
Tag:    v2.4.5

Merge branch 'MDL-38079_24' of git://github.com/mr-russ/moodle into MOODLE_24_STABLE

commit 04597742cf5d4fbc22085433398eb9053868eeb0
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 09:13:26 +0800
Tag:    v2.5.1

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

commit ba75dfd10d027e2c10cf68eaf394eea849657ecf
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Jun 2013 08:43:29 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-40142-m26' of git://github.com/samhemelryk/moodle

commit 29a45089300d62cd8586eebf7ab6fbfdf192a6ae
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Jun 2013 08:40:39 +0800
Tag:    v2.5.1

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

commit 37d38a3125d752135d5d790d15b689faeaed652d
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 14 Jun 2013 11:50:50 +0800
Tag:    v2.5.1

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

commit 3bc90f93ee2483e252e5ea81c357dcfeac0cc736
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 14 Jun 2013 10:53:23 +0800
Tag:    v2.6.0-beta

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

commit 8ea7d3a2dbe4d3249cca0f17d2d62a13cbd54512
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 12 Jun 2013 15:22:22 +0800
Tag:    v2.6.0-beta

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

commit 128e9315d6f87ebe20207f07ad5cbf17e292f52d
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 12 Jun 2013 14:53:49 +0800
Tag:    v2.6.0-beta

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

commit ab8e5e795d46a3858bed6b5ce7e172262e7bd4fb
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 11 Jun 2013 13:57:14 +0800
Tag:    v2.6.0-beta

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

commit 849a0161283fcf4313b308b66a07a01a432ea113
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 11 Jun 2013 13:32:27 +0800
Tag:    v2.6.0-beta

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

commit 7a70cfe638ef08297403d874418110c7d09549f1
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 11 Jun 2013 12:57:34 +0800
Tag:    v2.6.0-beta

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

commit d5bba86435a48140c0c7e13707ba758224d38f4e
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 11 Jun 2013 10:12:36 +0800
Tag:    v2.3.8

Merge branch 'MDL-39412_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 351f4729e2f722488850deba39157f79e6aec877
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 11 Jun 2013 10:02:01 +0800
Tag:    v2.4.5

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

commit 55711b0a0d25b48037930fd2e4195556ff08db33
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 21 May 2012 18:17:25 +0800
Tag:    v2.3.0-beta

Merge pull request #4 from mudrd8mz/wip-files23-fixes