Git merges in Moodle x.x.x by Eloy Lafuente (stronk7)

commit 6b8798dedb97c6e675360c0f4ff43095b0a5e856
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 03 Apr 2014 03:32:42 +0800
Tag:    v2.7.0-beta

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

commit c790670d7787350cc1b3b0960ddd36f7b0052781
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Apr 2014 10:05:19 +0800
Tag:    v2.7.0-beta

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

commit 2e20fc3742cf9312c71b9e24c020543406d071e5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Apr 2014 09:18:05 +0800
Tag:    v2.7.0-beta

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

commit bfa5acac647aca54bcba3b510a549124589668d9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Apr 2014 09:14:06 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-24408_2' of https://github.com/oasychev/moodle

commit 6faa51785601fa6f16b8955cb1d276948f5f3eb6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Apr 2014 08:57:15 +0800
Tag:    v2.7.0-beta

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

commit b224448ac6ff1c4c17024ed0f09562567b0448ea
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Apr 2014 08:47:59 +0800
Tag:    v2.7.0-beta

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

commit 0555761203f827414ae017e716c2a5562c90bf09
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Apr 2014 08:22:51 +0800
Tag:    v2.7.0-beta

Merge branch 'w14_MDL-44843_m27_localedash' of https://github.com/skodak/moodle

commit bd032a64f94e60066c677cd3f6cfa3831b031e62
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Apr 2014 08:18:54 +0800
Tag:    v2.7.0-beta

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

commit 57c92af7ad7f77306dd5338005932faf2801c56c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Apr 2014 07:52:41 +0800
Tag:    v2.7.0-beta

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

commit 929e32489ffa2f2885387f82f2c632e6db9000ee
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Apr 2014 07:12:52 +0800
Tag:    v2.7.0-beta

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

commit e154e9d8cd5837961e58f1850783756b8a8cc680
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Apr 2014 06:27:30 +0800
Tag:    v2.7.0-beta

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

commit eafbd56da9038cd1aac2b06dd2200d476235bd41
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Apr 2014 03:50:09 +0800
Tag:    v2.7.0-beta

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

commit eb4606aeb06c40ddbdf200fa516d923d9540fb96
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 26 Mar 2014 04:53:38 +0800
Tag:    v2.7.0-beta

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

commit 767a5a08d940144c6f00a06178df1bc1b43712fd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 26 Mar 2014 04:37:26 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-37418_master' of git://github.com/ds125v/moodle

commit c56e0192ef75fdb68ec98400e44a2a7b7415f0dd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 26 Mar 2014 04:03:44 +0800
Tag:    v2.7.0-beta

Merge branch 'w13_MDL-44510_m27_phpunit4' of https://github.com/skodak/moodle

commit 1c774322babd6c388264d287290a67f7893d618d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Mar 2014 09:14:00 +0800
Tag:    v2.7.0-beta

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

commit b9add57766b3b53796cc03a04f1880bffa9f9424
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Mar 2014 08:23:08 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-41216' of https://github.com/nobelium/moodle

commit a4627988fd9f79648ebbf3eb3631fb31fb8a532f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Mar 2014 08:02:51 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44328-M27' of git://github.com/lazydaisy/moodle

commit 1700bec3c64ae7f85bf868c826e3d6a0374e1c58
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 14 Mar 2014 02:12:25 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43266_master-last-fixes' of git://github.com/dmonllao/moodle

commit 38c5e34c00f1c980d1ed78bb1f655efb72d265fb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 14 Mar 2014 01:33:15 +0800
Tag:    v2.7.0-beta

Merge branch 'mdl27_mdl-43497_allow_force_language_02' of https://github.com/brki/moodle

commit e6496624896bd2ddf661b398b76c28f14b3bc4e9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 14 Mar 2014 01:32:41 +0800
Tag:    v2.7.0-beta

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

commit 478baf833473811887c0c11aabc57d4339443ba2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 12 Mar 2014 07:17:52 +0800
Tag:    v2.7.0-beta

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

commit 6d9ba13dc8d042d20169ecfd77aa46e2cd8533ad
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Mar 2014 07:28:34 +0800
Tag:    v2.7.0-beta

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

commit 3fb5bd96e85840d368d0ed78162a43b60ec91a94
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 07 Mar 2014 05:17:16 +0800
Tag:    v2.6.2

Merge branch 'install_26_STABLE' of git://git.moodle.org/moodle-install into MOODLE_26_STABLE

commit 495d15279baf0b02aba2adf5686f7e21226e9def
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 07 Mar 2014 05:17:05 +0800
Tag:    v2.5.5

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

commit 5d04aed14867c974c31c0cdbcd6040e313d2a843
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 07 Mar 2014 05:16:48 +0800
Tag:    v2.7.0-beta

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

commit bf6f9d043d42d47faf214c03e59b5d65a06aa637
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 06 Mar 2014 07:37:09 +0800
Tag:    v2.5.5

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

commit 728ece64e4af71cc4446a880b80b85cc957200a5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 06 Mar 2014 07:36:27 +0800
Tag:    v2.6.2

Merge branch 'MDL-44425-en_fix_26' of git://github.com/mudrd8mz/moodle into MOODLE_26_STABLE

commit 170c87d808ef696b25c5412f9fa1e55efbe45bdb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 06 Mar 2014 07:35:28 +0800
Tag:    v2.7.0-beta

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

commit 3bcd0f23ff508953b4d436060660a73ae26c5b60
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 20 Feb 2014 19:43:25 +0800
Tag:    v2.6.2

Merge branch 'install_26_STABLE' of git://git.moodle.org/moodle-install into MOODLE_26_STABLE

commit 6e21938526085115227356c90c0f924b002bf675
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 20 Feb 2014 19:43:17 +0800
Tag:    v2.5.5

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

commit b268d4a05cb223bab37d958d8572c193d4420939
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 20 Feb 2014 19:43:10 +0800
Tag:    v2.4.9

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

commit 1a561214af4f8167e78dd5977af9a3797d89d635
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 20 Feb 2014 19:42:59 +0800
Tag:    v2.7.0-beta

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

commit a7bf707974f74063a71ff32d114a603f153e9f46
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Feb 2014 08:33:20 +0800
Tag:    v2.7.0-beta

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

commit 88f1b3d6b7f4750ac7dd484ae1ea4e4b5ea29128
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Feb 2014 08:32:25 +0800
Tag:    v2.7.0-beta

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

commit 86252eb6dfaa4c5e1486fe33d204e5d9ba7a31ef
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Feb 2014 08:31:13 +0800
Tag:    v2.7.0-beta

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

commit 8817802bfd64f7c81bfc8d5b7437e55b7d82d7a1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Feb 2014 08:30:43 +0800
Tag:    v2.7.0-beta

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

commit 6030ef565f0343823c2dc0e1244458be3dbe57ab
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Feb 2014 08:28:53 +0800
Tag:    v2.7.0-beta

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

commit 22e4df8e634680fb6bc69da4c25793d7ab9cd24f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Feb 2014 08:23:04 +0800
Tag:    v2.7.0-beta

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

commit faefe571c5a08fc5b1f1a23b8c09757df0aa25d9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Feb 2014 08:21:16 +0800
Tag:    v2.7.0-beta

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

commit 6151f9de4cef6fe55d191aa8869ddbaa654325ca
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Feb 2014 08:20:10 +0800
Tag:    v2.7.0-beta

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

commit bb0949467e38e885a1ac945a5e51368731e37dc5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Feb 2014 08:19:43 +0800
Tag:    v2.7.0-beta

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

commit 5f88a2fc11538266f0af4df735bcfe6aacca911f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Feb 2014 08:19:04 +0800
Tag:    v2.7.0-beta

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

commit 360a0b4480b0effedce7972d9683d1d79edbf699
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Feb 2014 08:12:57 +0800
Tag:    v2.7.0-beta

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

commit 361d13c04a9899ee62b3ed4c2ecafb4cda60b525
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Feb 2014 08:11:46 +0800
Tag:    v2.7.0-beta

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

commit f02613d6d613bbee9e718476a741d27e3f54de21
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Feb 2014 08:11:06 +0800
Tag:    v2.7.0-beta

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

commit c753d768798c7bc0b290295a6ebabde5436deeda
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Feb 2014 08:08:58 +0800
Tag:    v2.7.0-beta

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

commit 0919e70204ea8c35ee83e3067d3935c45517674e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Feb 2014 08:08:23 +0800
Tag:    v2.7.0-beta

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

commit 0a3f8b26e4bfa4bc9a28b359b1ffcd40b0b728e8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Feb 2014 08:03:57 +0800
Tag:    v2.7.0-beta

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

commit c14a54c230d3582c33ef3f87daac146898b65c8e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Feb 2014 08:03:22 +0800
Tag:    v2.7.0-beta

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

commit a9d44ff518b9c16efe5d97467fe30f8c47b28fbb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Feb 2014 08:02:00 +0800
Tag:    v2.7.0-beta

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

commit bfe7c33c07406911cfbec85eea7289bb49d0d337
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Feb 2014 08:01:27 +0800
Tag:    v2.7.0-beta

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

commit 52c5fb1c0f898e9317cef97e0f8bb14f0708e16f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Feb 2014 08:00:32 +0800
Tag:    v2.7.0-beta

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

commit cb3385aefad9e987c98ec50a6b10409bc5775173
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Feb 2014 06:56:23 +0800
Tag:    v2.5.5

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

commit 9f5ac013a331cdbd3c5ee0d1b52c5e77a8b93b41
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Feb 2014 06:56:12 +0800
Tag:    v2.6.2

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

commit 8167063ac121f71f395ba7f73bbe5206e8c87b50
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Feb 2014 06:55:52 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43265_new' of https://github.com/jacks92/moodle

commit 28644233349a8d5789e2681af103d347110677c7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Feb 2014 06:25:44 +0800
Tag:    v2.5.5

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

commit 77da718f1b5488955fd2aa12a515461878f65848
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Feb 2014 06:25:30 +0800
Tag:    v2.6.2

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

commit 33ce661816c37f6f03a52737ed7331cf4869e477
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Feb 2014 06:24:45 +0800
Tag:    v2.7.0-beta

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

commit 42651ea3f17cb2081f555513edbc1e08ec58a7b0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Feb 2014 09:12:30 +0800
Tag:    v2.5.5

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

commit 0f678757a4087c8fbd22b0eb004b29d0c3cec20b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Feb 2014 09:06:19 +0800
Tag:    v2.6.2

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

commit 974cc3b0c2fa8551e57acd9d2faf107d26832f83
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Feb 2014 08:55:23 +0800
Tag:    v2.7.0-beta

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

commit f3da891068b35a9f43ce5e30734b3554ac7404ca
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Feb 2014 08:50:24 +0800
Tag:    v2.7.0-beta

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

commit 21f323781d7456ad0535e7311d879c22e8bde88b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Feb 2014 08:47:31 +0800
Tag:    v2.7.0-beta

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

commit a6d5288e41161e9ff5bcaa7252c29930823013d9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Feb 2014 08:46:47 +0800
Tag:    v2.7.0-beta

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

commit af928012ef620e69f1bf53799d4a3d7eda8daf89
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Feb 2014 08:46:14 +0800
Tag:    v2.7.0-beta

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

commit 450ddd2e4ddd81e7dc362dad0c3c9dc488da6129
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Feb 2014 08:27:04 +0800
Tag:    v2.7.0-beta

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

commit 6f9b4cccb4bd63f028264cee588ef9181cece79d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Feb 2014 08:02:22 +0800
Tag:    v2.7.0-beta

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

commit 5234427f2d993863eb285021568fefa702ee61f1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Feb 2014 07:56:26 +0800
Tag:    v2.7.0-beta

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

commit e6b9b5538d0aa2642dccf237e6ea9fb069371f48
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Feb 2014 07:55:53 +0800
Tag:    v2.7.0-beta

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

commit 79272452888087718423af6314ad42165fdd192b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Feb 2014 07:55:19 +0800
Tag:    v2.7.0-beta

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

commit b629de817a1236a5154c96b3409ebde474cc05d0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Feb 2014 07:54:28 +0800
Tag:    v2.7.0-beta

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

commit 08e622b2482bfd717106b9363a4df695e7a2b985
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Feb 2014 07:53:22 +0800
Tag:    v2.7.0-beta

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

commit 6a586f0036479d6963100b32cd0847f33fa5f70f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Feb 2014 07:51:33 +0800
Tag:    v2.7.0-beta

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

commit 1f09c262980f37156cd0d44aa71614a6866ed3ca
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 17 Feb 2014 22:45:01 +0800
Tag:    v2.7.0-beta

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

commit 47e4397538a0790b9ecd9d2a0131abce4cbf0f6d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 13 Feb 2014 22:30:03 +0800
Tag:    v2.6.2

Merge branch 'install_26_STABLE' of git://git.moodle.org/moodle-install into MOODLE_26_STABLE

commit ac58bd76b840ae7206862bfe5eed430d6ba3b950
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 13 Feb 2014 22:29:53 +0800
Tag:    v2.5.5

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

commit eee94e31fbcdfed3ff9b0a6b694999809782a152
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 13 Feb 2014 22:29:34 +0800
Tag:    v2.7.0-beta

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

commit 16b2fc591379080e14b836779cb7c1d99fa6ba3d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Feb 2014 07:26:29 +0800
Tag:    v2.7.0-beta

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

commit 395988e4337b00d6852b7f5f7ac802e1a56d5bca
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 10 Feb 2014 23:48:26 +0800
Tag:    v2.7.0-beta

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

commit 9433b01c94c9a4d56a6dd124ed1811dc0e56646c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Feb 2014 06:56:27 +0800
Tag:    v2.7.0-beta

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

commit d088fbebacbc560b080707eddcdc4704bad34297
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Feb 2014 17:53:28 +0800
Tag:    v2.6.2

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

commit 5ecfa56512ed1861e8df23a69b501eaa6f634492
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Feb 2014 17:53:17 +0800
Tag:    v2.7.0-beta

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

commit 06a25d72fad948c520f9fdc760c2a7c3d901427f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Feb 2014 17:41:10 +0800
Tag:    v2.5.5

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

commit 4947703a0b64fac8a99a2ccd9e565afe9f94d3de
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Feb 2014 17:40:57 +0800
Tag:    v2.6.2

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

commit 845e11407f08461ce3a2a45ca7d092d6a2c83119
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Feb 2014 17:11:42 +0800
Tag:    v2.7.0-beta

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

commit d29b8f434297085c5d52082482d3a112b1b0c079
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Feb 2014 07:59:58 +0800
Tag:    v2.7.0-beta

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

commit 2c4e0686390077463021b014c4a3b70747cf8891
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Feb 2014 07:16:48 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43687' of https://github.com/mkassaei/moodle

commit ae9a8e772ab71d039615cbc3384386986960e1d5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Feb 2014 07:12:18 +0800
Tag:    v2.5.5

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

commit 21fe8c33559c7b439fdadea4d687aa622c6510e4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Feb 2014 07:11:20 +0800
Tag:    v2.7.0-beta

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

commit 85f47a3ebd92e767700ddd2121551b2390630fa5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Feb 2014 06:58:22 +0800
Tag:    v2.5.5

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

commit e28eb21659ce6c484e1ee4c5d89ff5908cae91ef
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Feb 2014 06:58:14 +0800
Tag:    v2.6.2

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

commit 263979ebee828e6f3d239eab51a6556acbd4ee0a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Feb 2014 06:58:07 +0800
Tag:    v2.7.0-beta

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

commit ba971d4ccae53b3a85f586eeff2afc91927900ee
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Feb 2014 00:58:49 +0800
Tag:    v2.5.5

Merge branch 'm25_MDL-37714' of git://github.com/greg-or/moodle into MOODLE_25_STABLE

commit fa10d60b154254626845ad65404f8f857b990d01
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Feb 2014 00:58:38 +0800
Tag:    v2.6.2

Merge branch 'm26_MDL-37714' of git://github.com/greg-or/moodle into MOODLE_26_STABLE

commit 4f31798dfcde638578fced53e8553676af261568
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Feb 2014 00:58:30 +0800
Tag:    v2.7.0-beta

Merge branch 'master_MDL-37714' of git://github.com/greg-or/moodle

commit fefcd9ababd7743157b2ae52d2b0a9b41672750f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Jan 2014 08:52:49 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43040'

commit 04224a6dc786ca676fe7e486b03a0675ac566a0a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 19:22:56 +0800
Tag:    v2.6.2

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

commit 51cba7809c25feb12b3a5f981937f1e9263c4803
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 19:22:23 +0800
Tag:    v2.7.0-beta

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

commit 6dcea23522488d15d1a24267fea3f9f32e1e2e22
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 17:43:51 +0800
Tag:    v2.7.0-beta

Merge branch 'w04_MDL-34055_m27_insertrecords' of https://github.com/skodak/moodle

commit 23cf5d3da267951603513f6435772c9261419f8a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 07:44:49 +0800
Tag:    v2.5.5

Merge branch 'm25_MDL-43797' of https://github.com/totara/moodle into MOODLE_25_STABLE

commit 960dfcae5915e7665c4a095592bdc1044b76be15
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 07:44:24 +0800
Tag:    v2.6.2

Merge branch 'm26_MDL-43797' of https://github.com/totara/moodle into MOODLE_26_STABLE

commit 56f39760acdf4ca4bce25079118148843d32376c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 07:43:16 +0800
Tag:    v2.7.0-beta

Merge branch 'master_MDL-43797' of https://github.com/totara/moodle

commit 9fc25660c5309f133f4562bedf11564a5f2f3300
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 07:07:57 +0800
Tag:    v2.7.0-beta

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

commit 68fe9b045c9e451d4b514585263a7d2612129aba
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 07:01:26 +0800
Tag:    v2.5.5

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

commit 115707c2b5bffd2e96088ffac52efe471dca3e0e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 07:00:16 +0800
Tag:    v2.6.2

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

commit bc6a79aee6fe5e350e59d43bc0fd83e3fad25ffa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 06:58:18 +0800
Tag:    v2.7.0-beta

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

commit 2ee4c9957532294268b3db8ca032a209438b5b73
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 06:53:40 +0800
Tag:    v2.5.5

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

commit d9613f122f992ad094f9192cfd062e60692daa1c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 06:53:33 +0800
Tag:    v2.6.2

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

commit 835ef9d84c5a85501f750acdcda38a33aff87f3e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 06:52:07 +0800
Tag:    v2.7.0-beta

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

commit e3870e29d8558c026d928b5d26a81cda2bdfb718
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 04:11:23 +0800
Tag:    v2.5.5

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

commit 646f774a0f7657dfbf3dfddc85279abe76951e37
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 04:11:11 +0800
Tag:    v2.6.2

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

commit 2c8b15c50d4264e37c70bbb5b215a9a0bd196abe
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 04:11:03 +0800
Tag:    v2.7.0-beta

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

commit 408b3ee93f92d8b4be299fce0f67f86eddb18874
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 02:23:35 +0800
Tag:    v2.6.2

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

commit b598c481792d3945f7dee59f7191978eeaea0e0b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 02:23:09 +0800
Tag:    v2.7.0-beta

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

commit 238e8a94f8c9cb1e7ae4075cf1c1070e8c90c0cf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 02:20:52 +0800
Tag:    v2.5.5

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

commit 06b2987aad85774091d5dd7d3e4a27ffd383bdd6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 02:20:02 +0800
Tag:    v2.6.2

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

commit 705718fb7c37a8bdf2413bf9b2f4eda977a530b0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 02:19:31 +0800
Tag:    v2.7.0-beta

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

commit 7e84ef177d695c89b61e3a18a5536da50ca00c4d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 00:23:32 +0800
Tag:    v2.5.5

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

commit 227164c9b6ca65dca39025ad3df84fc33e72673d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 00:22:49 +0800
Tag:    v2.6.2

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

commit c88dba093ed6434299e0d27f7323387ab30e6926
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 00:18:56 +0800
Tag:    v2.7.0-beta

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

commit 333751af3a8100ccb9a1eabaf5c5138959f2dcb0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 00:04:47 +0800
Tag:    v2.5.5

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

commit ff04a96ba299ff2bbfaf238a4ac268aa324b0266
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 00:04:11 +0800
Tag:    v2.6.2

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

commit 8fce57c0015be5c7968286282dcfc05798a137c6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 00:03:25 +0800
Tag:    v2.7.0-beta

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

commit f6590d5dd30786f884e9967a6fae411758ac6bf1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Jan 2014 19:02:51 +0800
Tag:    v2.5.5

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

commit 866bbb05f7adf7bee77f373f37387857ed2b82ec
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Jan 2014 19:02:36 +0800
Tag:    v2.6.2

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

commit 9be395ee99ae672e937c8d6e95bbd18a9c3a3cb3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Jan 2014 19:02:28 +0800
Tag:    v2.7.0-beta

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

commit e373f3bd042d04f2ac61fb823a2270fa192fe75d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Jan 2014 18:00:47 +0800
Tag:    v2.5.5

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

commit 7a6ad1058611e0b9cd519aca1c2845d17973f613
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Jan 2014 18:00:32 +0800
Tag:    v2.6.2

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

commit 5e7f4b1c198f641972c417cc0e1c6fed6fe8126d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Jan 2014 17:59:37 +0800
Tag:    v2.7.0-beta

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

commit f4068d757fbee4b8ae164a242cfb21829dc25f2b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Jan 2014 08:18:05 +0800
Tag:    v2.7.0-beta

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

commit 3b5e8aebbe65c4e761a2cf7d3eb6bc9a0166a569
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Jan 2014 07:26:44 +0800
Tag:    v2.7.0-beta

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

commit fc272062683d5e68118ddc4ba210eee2bb0d2319
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jan 2014 19:38:39 +0800
Tag:    v2.6.2

Merge branch 'install_26_STABLE' of git://git.moodle.org/moodle-install into MOODLE_26_STABLE

commit cd3c9e492b581171050f1b94b98830e5348dfb58
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jan 2014 19:38:29 +0800
Tag:    v2.5.5

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

commit 93473e5dd2f4e774ea2e46741a263a5b694ecb98
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jan 2014 19:38:06 +0800
Tag:    v2.7.0-beta

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

commit 8d8e51b0733c942813218bee10553887edcae354
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 09:01:35 +0800
Tag:    v2.6.2

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

commit bc6d39a561eae77a6b11bed4578e2a7b20694e88
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 08:59:50 +0800
Tag:    v2.7.0-beta

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

commit b61b21d7ee9fbb72c45709c11c18004386ee1679
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 08:54:09 +0800
Tag:    v2.6.2

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

commit ba766c47721abb62c9402fa6e964659915ce46e3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 08:54:00 +0800
Tag:    v2.7.0-beta

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

commit 38dc2cc5bd91a5f12b657736d8fcf4795b51084e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 08:47:00 +0800
Tag:    v2.5.5

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

commit a45dbb214bbc804df3875407d47da04f811e1d91
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 08:46:54 +0800
Tag:    v2.6.2

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

commit 2079744b84574992d58d8be70b00b336a4b7a26f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 08:46:16 +0800
Tag:    v2.7.0-beta

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

commit 1075da56e21eb04a5d3af2dd42948c848bc4e2e7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 08:44:56 +0800
Tag:    v2.5.5

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

commit f973e5f9687cb8226a845aa0b14660b506ab45c3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 08:44:45 +0800
Tag:    v2.6.2

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

commit b7623bcb5d6663a17669ff9de66125ea0333e267
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 08:43:13 +0800
Tag:    v2.7.0-beta

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

commit 3dfaeb413b5df7bc7106250800c6d368e856d0f0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 08:14:01 +0800
Tag:    v2.5.5

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

commit 3e1eb36d774322793f38834d257e8b8e85a2ac78
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 08:13:54 +0800
Tag:    v2.6.2

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

commit ad1ad9f5b41f571ea8f0deef8dfc5fa6c6fca471
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 08:13:04 +0800
Tag:    v2.7.0-beta

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

commit 3dfb63df12e161ac2972eec76d3498a7eee0f595
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 07:21:58 +0800
Tag:    v2.5.5

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

commit 3677e0c1aaf6c266c0a1f9c8e1fb18f356c7dba6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 07:20:51 +0800
Tag:    v2.6.2

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

commit b0512f418b8a2efdff3680d49a24e7636997c9fe
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 07:20:28 +0800
Tag:    v2.7.0-beta

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

commit 9a0d6896d0c50b333f00b5554bc2aefb7de0c63f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 07:17:48 +0800
Tag:    v2.5.5

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

commit 133e38fdbbbb12d0e3cf1856927518c7ca3eadcd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 07:17:39 +0800
Tag:    v2.6.2

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

commit 1816a46d1112339febfd0ca10ad90315943d2627
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 07:17:31 +0800
Tag:    v2.7.0-beta

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

commit 7c5074ce8247c0546da923f570d1c621359cd0dc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 07:05:11 +0800
Tag:    v2.6.2

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

commit 9faed21cb9709baedfde83af089fb9f239b34893
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 07:05:03 +0800
Tag:    v2.7.0-beta

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

commit db8c137e3583de9d7f63b0089fd3fbb7379c8341
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 07:03:03 +0800
Tag:    v2.5.5

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

commit a7029b542efb0d2016faab3dcd936b2d025cd2f7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 07:02:11 +0800
Tag:    v2.6.2

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

commit 221e6adaa55bd5949774cc70f8d3e0e17d170ea0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 06:59:27 +0800
Tag:    v2.7.0-beta

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

commit 2ad45eaf5330ca3b35274e6bcf8e893cb6fd1fb1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 06:43:05 +0800
Tag:    v2.5.5

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

commit 40e8488c8dc50203f6f366313c4669736de3504a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 17 Jan 2014 01:51:14 +0800
Tag:    v2.6.2

Merge branch 'install_26_STABLE' of git://git.moodle.org/moodle-install into MOODLE_26_STABLE

commit 2e3aa01daae548aedc157dbb5311686aee6ba1cb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 17 Jan 2014 01:51:04 +0800
Tag:    v2.5.5

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

commit 54add634bb16cbf98f1d6fd8fe0b075a86ee4621
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 17 Jan 2014 01:50:44 +0800
Tag:    v2.7.0-beta

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

commit cc3bfdc006531840e29f8b9f8aeb243e131a39fa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 16 Jan 2014 05:02:54 +0800
Tag:    v2.5.5

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

commit ba541f01b6d753292e359f117429e72087ec303a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 16 Jan 2014 05:02:29 +0800
Tag:    v2.6.2

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

commit da272e6b6bc7ff2d4707f34dc7a0a4c18c4881b1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 16 Jan 2014 05:02:12 +0800
Tag:    v2.7.0-beta

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

commit 893139fd12d7e6ab874f761593bf3bcb4bb50ae2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jan 2014 11:01:11 +0800
Tag:    v2.6.2

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

commit 19c32aaceaf6c4663998680cdad6cc745bd52f07
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jan 2014 10:59:51 +0800
Tag:    v2.7.0-beta

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

commit 66e46b4859b70d4f90d7d49652242b5644b8191b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jan 2014 07:11:18 +0800
Tag:    v2.6.2

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

commit 75bdb2bfc7302d63ac156be727b75c6ede57d3f7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jan 2014 07:03:34 +0800
Tag:    v2.7.0-beta

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

commit 7d4c752e315d3a5b91a51c9d124afb28f9f91948
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jan 2014 05:08:46 +0800
Tag:    v2.7.0-beta

Merge branch 'w02_MDL-43524_m27_textcaching' of https://github.com/skodak/moodle

commit 988c6ba1b8bb969e8d6915ad240f227832ac5461
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jan 2014 05:03:02 +0800
Tag:    v2.7.0-beta

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

commit 65e9de16c24c2052e231affe9a6e208e8b6bc4d4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jan 2014 04:49:37 +0800
Tag:    v2.6.2

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

commit a89836aa2762ff9cef118f449a9ac239fca11c41
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jan 2014 02:08:02 +0800
Tag:    v2.5.5

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

commit 5d394d10a3432acfcec516ab0530e7f94d673377
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jan 2014 23:57:13 +0800
Tag:    v2.5.5

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

commit ff48f6f0e72cb81f0f26504a10e757249945e96a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jan 2014 23:53:40 +0800
Tag:    v2.6.2

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

commit 372a6122210969a89137aa2a0811635d92b5b3f4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jan 2014 23:48:22 +0800
Tag:    v2.7.0-beta

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

commit 712cb8569e69ab25e950b2da4fdc5fda2600e3a5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jan 2014 23:45:53 +0800
Tag:    v2.5.5

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

commit f5191afd30c2221ce0c2340826709b5bb04a7abf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jan 2014 23:45:38 +0800
Tag:    v2.6.2

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

commit e5f7cce1c1ff4febc5f4358911fb426144d1d23b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jan 2014 23:44:11 +0800
Tag:    v2.7.0-beta

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

commit da47e297da5951e87928ea99405ed4a1e081647a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jan 2014 23:39:00 +0800
Tag:    v2.7.0-beta

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

commit 1b92203ef3582b8b7a6a807c2ef25b94f07c780b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jan 2014 23:01:27 +0800
Tag:    v2.7.0-beta

Merge branch 'w02_MDL-43537_m27_env' of https://github.com/skodak/moodle

commit 5af2e8c082a05a6d4a7fab4117aed2fe962665eb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jan 2014 04:55:18 +0800
Tag:    v2.5.5

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

commit 8c75f0572182ff0d2de5329566b590d30491a16f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jan 2014 04:51:54 +0800
Tag:    v2.6.2

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

commit 295f7a61374fd3a9f90b59c3876f0b33ba069d9c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jan 2014 04:51:27 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43109' of https://github.com/mdikih/moodle

commit c33eb444fc982c063f524c861caa8545dacebf02
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jan 2014 02:10:13 +0800
Tag:    v2.7.0-beta

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

commit b9da30cfd2067cce1c999b8837f2e3e1de362000
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 13 Jan 2014 23:31:00 +0800
Tag:    v2.7.0-beta

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

commit 86290203d9915bc6e6ae03b57982f562120f1335
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 11 Jan 2014 22:57:04 +0800
Tag:    v2.3.11

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

commit 77f8d8142fd5d0a9093c513e3726e9364279e608
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 Jan 2014 17:10:37 +0800
Tag:    v2.5.4

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

commit 02b5deb65a57b85b5c65ab8d70810fcbdfd88e14
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 Jan 2014 17:10:27 +0800
Tag:    v2.6.1

Merge branch 'MDL-43590-en_fix_26' of git://github.com/mudrd8mz/moodle into MOODLE_26_STABLE

commit 577432283cd28b805a2c7b819452a045a578adf2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 Jan 2014 17:08:34 +0800
Tag:    v2.7.0-beta

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

commit d9aa7cbb6fe5a8a4a138035e2ef17fd5bfb94fe6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 Jan 2014 06:07:52 +0800
Tag:    v2.6.1

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

commit 24d74a68046c1b23bca4aec1b836a8bbcc5a0004
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 Jan 2014 06:07:19 +0800
Tag:    v2.7.0-beta

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

commit 305e60a5e22752e9c00f1456ba4002a78f5ca7fa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 09 Jan 2014 17:19:25 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43330_master-skippedexception-namespace' of https://github.com/dmonllao/moodle

commit d68829aac0f031066e1a4e3d0a06deaeb4142235
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 16:55:08 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43423_master-increase-timeout' of git://github.com/dmonllao/moodle

commit ccd01c08f4501b372b90f0cb2defe22c7a454d60
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 09:18:21 +0800
Tag:    v2.5.4

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

commit a3fa0ca96fdfd574d2bf6a8fb0fe86d288ee6948
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 09:17:42 +0800
Tag:    v2.6.1

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

commit ab7f49834334cac00f272ba8069693753ca2674c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 09:15:03 +0800
Tag:    v2.7.0-beta

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

commit 51add5708c119a9511d3cc227167f598af15a054
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 09:11:13 +0800
Tag:    v2.5.4

Merge branch 'w01_MDL-42797_m25_admin' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 895e16ff28918999ee351bbc399d3c3017cc942b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 09:10:36 +0800
Tag:    v2.6.1

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

commit e6a6eb7838239f1e14bfb4f5ff97f8e0a484755a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 09:09:55 +0800
Tag:    v2.7.0-beta

Merge branch 'w01_MDL-42797_m27_admin' of https://github.com/skodak/moodle

commit 6cb311f306110cee749190bc49f663f53817e7c3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 09:03:16 +0800
Tag:    v2.5.4

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

commit 93073173ce10cd66147dac01f96450058787f5d8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 09:02:56 +0800
Tag:    v2.6.1

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

commit 69ebcb42224fb2262a172f1ce134e4c70b8e87b2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 09:02:29 +0800
Tag:    v2.7.0-beta

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

commit a1017ec83782c6a7b4f7ab9ed6ab441a5f300082
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 08:59:21 +0800
Tag:    v2.7.0-beta

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

commit 09aa9e90b9d09ff0bdfc1cc071c7d4b93dcef801
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 08:52:58 +0800
Tag:    v2.4.8

Merge branch 'wip-MDL-42310-24' of git://github.com/abgreeve/moodle into MOODLE_24_STABLE

commit f9e99683f76f663eab95259839dc5c11abd0b82d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 08:52:48 +0800
Tag:    v2.5.4

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

commit 5c283bb71367593e1143dcd5f0d7a3b29b94abe8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 08:52:12 +0800
Tag:    v2.6.1

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

commit 0601a82aff380e5369fce4ce0ed91a4ae70c1e03
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 08:32:28 +0800
Tag:    v2.7.0-beta

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

commit 143dc29e0d609517de4d05010db627a88eb8fe37
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 07:46:31 +0800
Tag:    v2.4.8

Merge branch 'm24_MDL-43508_Invalid_String_Identifier' of https://github.com/scara/moodle into MOODLE_24_STABLE

commit cedb3f64285771bb0169fc582b1f58f30218a9ac
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 07:46:20 +0800
Tag:    v2.5.4

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

commit 52d8541b5b688881ac35d21cb18a1699542c090c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 07:46:13 +0800
Tag:    v2.6.1

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

commit 45f6a8340bc78c65c667444b11c1aa746eec4ff0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 07:45:51 +0800
Tag:    v2.7.0-beta

Merge branch 'm27_MDL-43508_Invalid_String_Identifier' of https://github.com/scara/moodle

commit dcc69ec0403409aa67bec75f2186923e7c466cb4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 07:42:52 +0800
Tag:    v2.5.4

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

commit 99a57908f53a4489b756d4a28a211b80fb0a9aba
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 07:42:45 +0800
Tag:    v2.6.1

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

commit b8a8f3dd017492612d01b1de6ddc0a4b9e717f18
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 07:39:15 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-42607_rss' of https://github.com/andyjdavis/moodle

commit d88a96388330fc03cb248fd72d34ba28ba3f1e96
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 07:34:01 +0800
Tag:    v2.5.4

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

commit ebe415f889fc3ea303f1ca8ef358f3c4edc57646
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 07:33:48 +0800
Tag:    v2.6.1

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

commit 430740f65ac051452308d3acedbe66c181419eaa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 07:23:40 +0800
Tag:    v2.7.0-beta

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

commit 78b31176cbf2a7a73040c878d25083923d6adf8b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 07:13:28 +0800
Tag:    v2.7.0-beta

Merge branch 'w01_MDL-43515_m27_phpunitdocs' of https://github.com/skodak/moodle

commit 382addccefaa9bcc0d93f46e93b648d68acdc785
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 06:42:55 +0800
Tag:    v2.7.0-beta

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

commit 7ad46ac29dda3e1d773e9d075c1f28aa25ca34dc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 06:40:51 +0800
Tag:    v2.7.0-beta

Merge branch 'w01_MDL-43503_m27_pagedldap' of https://github.com/skodak/moodle

commit f0d61c012de4bce25d79b3adcc5fe9eae560ddb6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 06:38:28 +0800
Tag:    v2.6.1

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

commit b3b1b18a4f055e114afda108626dd89d1078db7b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 06:32:38 +0800
Tag:    v2.7.0-beta

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

commit 93b6f3c79e1dc7c9276d87194c0a7321f0880bdd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Dec 2013 07:46:12 +0800
Tag:    v2.6.1

Merge branch 'w52_MDL-43314_m26_floats' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit c4edcce3ac31c6dc3f592a038aa746535fa253ce
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Dec 2013 07:20:24 +0800
Tag:    v2.7.0-beta

Merge branch 'w52_MDL-43314_m27_floats' of https://github.com/skodak/moodle

commit d4a8372892760607b737fddfd44dabbc28c43069
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 23 Dec 2013 07:51:09 +0800
Tag:    v2.5.4

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

commit a4c14b94cabe8e48f6c1b2c2004e34b2032e5b3f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 23 Dec 2013 07:39:48 +0800
Tag:    v2.6.1

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

commit a6761e26e759ef96e78eed7b3654c0fc2da92d2d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 23 Dec 2013 07:39:41 +0800
Tag:    v2.7.0-beta

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

commit 9f9618fa692da3e42162725a632c5f805e475d9e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 20 Dec 2013 09:58:12 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43404_master-move-fails-to-scenarios' of git://github.com/dmonllao/moodle

commit c751d81bbc94b9a359a4b66f818ee018c491cb9f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 19 Dec 2013 08:37:57 +0800
Tag:    v2.7.0-beta

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

commit 404b3d265434d6d878150784083efc842076a4f7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Dec 2013 19:09:20 +0800
Tag:    v2.5.4

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

commit ae20e634d7200c2e2e6f6013501bea3cb0d5ace1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Dec 2013 09:24:19 +0800
Tag:    v2.6.1

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

commit f77233dfaad8f1b32ee22171d3ea5a6b7278c21b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Dec 2013 09:24:08 +0800
Tag:    v2.7.0-beta

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

commit bb0746c985f97f7baaaf871c286f4d4a7acad4e8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Dec 2013 09:23:08 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-41292-master' of git://github.com/mr-russ/moodle

commit 5d2667fa077a7a0031d26b8132d8a98d636e4c66
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Dec 2013 07:13:15 +0800
Tag:    v2.7.0-beta

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

commit 04b53e0e0c1ecf73d9fd40c34f8d5f3a4662c2a1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Dec 2013 05:59:14 +0800
Tag:    v2.6.1

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

commit 1f71f7685aef159073602302730148ce45a2663b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Dec 2013 05:58:51 +0800
Tag:    v2.7.0-beta

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

commit 438e799f42be20a5d467127fdb98984f88b3353d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Dec 2013 05:33:51 +0800
Tag:    v2.7.0-beta

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

commit c70955dfa9367cb066c7d83945c1fc9cba8532a1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 Dec 2013 17:29:51 +0800
Tag:    v2.4.8

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

commit 1b646dc3627ca1abc4a162afa15284c4530af195
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 Dec 2013 17:29:42 +0800
Tag:    v2.5.4

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

commit e74f735a99d33426d56f348a8e6dfca50b6f1d83
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 Dec 2013 17:29:34 +0800
Tag:    v2.6.1

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

commit 0fb4218dad618ba3a0dc861812d5fad9a49b6e59
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 Dec 2013 17:29:25 +0800
Tag:    v2.7.0-beta

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

commit a84756919513dab9741c22d7e7ad2378bb69a718
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 12 Dec 2013 08:17:53 +0800
Tag:    v2.4.8

Merge branch 'w50_MDL-31410_m24_paypalipn' of https://github.com/skodak/moodle into MOODLE_24_STABLE

commit 47c14f40b782adb90cf1642a04315e7021bef3f5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 12 Dec 2013 08:17:39 +0800
Tag:    v2.5.4

Merge branch 'w50_MDL-31410_m25_paypalipn' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 4701b68a51f1e7cdbe1e69d6299d32f5374221b4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 12 Dec 2013 08:16:38 +0800
Tag:    v2.6.1

Merge branch 'w50_MDL-31410_m26_paypalipn' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit d47d52d5317fddaade0557b4ddde043362078518
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 12 Dec 2013 08:09:02 +0800
Tag:    v2.7.0-beta

Merge branch 'w50_MDL-31410_m27_paypalipn' of https://github.com/skodak/moodle

commit 3675c9850668f1e50cc096578c40ba042489a174
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 11 Dec 2013 06:31:51 +0800
Tag:    v2.6.1

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

commit ebc77165a4ad4a5a8b5e4d58e2ce804c2838b2d2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 11 Dec 2013 06:29:06 +0800
Tag:    v2.7.0-beta

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

commit 438ee6ebdc99ddb5b4de3102c973bff3c811e994
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 11 Dec 2013 06:24:56 +0800
Tag:    v2.7.0-beta

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

commit 6085ca703d17a06aee6b9ba30a299b783c155f0c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 11 Dec 2013 05:47:29 +0800
Tag:    v2.6.1

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

commit 7f347736651357af4208e9438d3d49cb90ed0486
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 11 Dec 2013 05:47:15 +0800
Tag:    v2.7.0-beta

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

commit 8a630a771cb76678ff7d8337a1130162f190c8f6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 11 Dec 2013 05:13:17 +0800
Tag:    v2.6.1

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

commit 5cf182e39d4c6b2e4e60fcc1631337cc4406668c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 11 Dec 2013 05:06:39 +0800
Tag:    v2.7.0-beta

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

commit 690c28e94a519325b0a34c64d7cc5aa073b838c4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 11 Dec 2013 02:47:21 +0800
Tag:    v2.4.8

Merge branch '24STABLE-wip-MDL-43135' of https://github.com/jennymgray/moodle into MOODLE_24_STABLE

commit 175b9dcfff1a3895b36324768019fd39b0604705
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 11 Dec 2013 02:46:59 +0800
Tag:    v2.5.4

Merge branch '25STABLE-wip-MDL-43135' of https://github.com/jennymgray/moodle into MOODLE_25_STABLE

commit 409e4794d7eabd2d1c224baee80ee8cc4e149d6e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 11 Dec 2013 02:46:31 +0800
Tag:    v2.6.1

Merge branch '26STABLE-wip-MDL-43135' of https://github.com/jennymgray/moodle into MOODLE_26_STABLE

commit 1c432ae6e1f1c0eacd19349f51acd29976272fee
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 11 Dec 2013 02:43:33 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-MDL-43135' of https://github.com/jennymgray/moodle

commit 2c4120360ac57a3dc92d2f36c28491afcd5eed14
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 09 Dec 2013 23:24:53 +0800
Tag:    v2.4.8

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

commit 3efc95ed812bc46446d12fdc315d13a2dfd6f399
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 09 Dec 2013 23:24:44 +0800
Tag:    v2.5.4

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

commit f37e3f357d4f53213af47fba8bbd3a5e855757d7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 09 Dec 2013 23:24:35 +0800
Tag:    v2.6.1

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

commit d073a5f11873746cd849401b486ad54198e83741
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 09 Dec 2013 23:24:26 +0800
Tag:    v2.7.0-beta

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

commit 45c03504ad5b5556a7e4027aaf028815f106f702
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Dec 2013 06:56:02 +0800
Tag:    v2.4.8

Merge branch 'MDL-41446-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE

commit f0b9fd3348a1522f08a781e2d89ea7306240e4d3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Dec 2013 06:55:56 +0800
Tag:    v2.5.4

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

commit ac184c9db2805a7ddfcedaff28f6988d2a115cb3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Dec 2013 06:55:49 +0800
Tag:    v2.6.1

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

commit e16b1bb12430fb5a95d5c5ae9f9ebc5f9d35c0f8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Dec 2013 06:55:42 +0800
Tag:    v2.7.0-beta

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

commit 2574b28b8136d7e69c18db13f452e7a2a71ecf9f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Dec 2013 06:45:54 +0800
Tag:    v2.7.0-beta

Merge branch 'w49_MDL-43117_m27_releaseinfo' of https://github.com/skodak/moodle

commit fd73fdaec03a8293f547887934793872208ce671
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Dec 2013 06:41:34 +0800
Tag:    v2.5.4

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

commit 786f04f485b06a678c9c84e283800604af4aa73e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Dec 2013 06:41:24 +0800
Tag:    v2.6.1

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

commit 200fcba7379206bbf72cdbd1e43544a45512708c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Dec 2013 06:40:19 +0800
Tag:    v2.7.0-beta

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

commit 008b26a6098ff663b1ddb5ade6fb26e7086ecb29
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Dec 2013 06:25:43 +0800
Tag:    v2.5.4

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

commit 310cf52b37dcf2351bb65894456e8f2372b1cb1b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Dec 2013 06:25:33 +0800
Tag:    v2.6.1

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

commit e3febb23159dd67900497b4d4f4b545dc2e1a81b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Dec 2013 06:24:22 +0800
Tag:    v2.7.0-beta

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

commit b5036ee20cf4235f855d11a038f1fa1f43392f72
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Dec 2013 02:33:30 +0800
Tag:    v2.6.1

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

commit 7b583eea956cbf5168a74b9205b47c99d9d5527c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Dec 2013 02:33:15 +0800
Tag:    v2.7.0-beta

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

commit 1abaa0c22ea32311ade9afe818f7e6ab7ca5da9b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Dec 2013 02:16:08 +0800
Tag:    v2.6.1

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

commit 75b296abf66be296142616163bdec715213f0dca
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Dec 2013 02:15:05 +0800
Tag:    v2.7.0-beta

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

commit 532a6ba83c3f7fcae81584ee5c0b03fd77db6df0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Dec 2013 00:37:15 +0800
Tag:    v2.4.8

Merge branch 'moodle24-mdl33971' of https://github.com/tlock/moodle into MOODLE_24_STABLE

commit e81cd4c37582e6b5610d9242f321c6a561c03701
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Dec 2013 00:18:26 +0800
Tag:    v2.5.4

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

commit 9a734d1862445a1c82803a3095788f139e2d6d69
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Dec 2013 00:18:02 +0800
Tag:    v2.6.1

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

commit 3e1a05790d2fcfc93ea8d93e5397edabd337e2eb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Dec 2013 00:17:06 +0800
Tag:    v2.7.0-beta

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

commit b357a2a0837a013a0c3c1a1744f9db8a39a69aef
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Dec 2013 22:38:24 +0800
Tag:    v2.5.4

Merge branch 'MDL-43079-25' of https://github.com/jamiepratt/moodle into MOODLE_25_STABLE

commit 6cc00494e2a71854422f79f8f876eadfefdacd76
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Dec 2013 22:36:25 +0800
Tag:    v2.7.0-beta

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

commit 35d228442380910680143cd4781d33f4beac319c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Dec 2013 17:02:00 +0800
Tag:    v2.5.4

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

commit b470112643a3bd559879b5f2e3724ed9ea6f2862
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Dec 2013 17:01:43 +0800
Tag:    v2.6.1

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

commit e7b3306a699fdec10377ea037face5164c351589
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Dec 2013 17:01:19 +0800
Tag:    v2.7.0-beta

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

commit d6ece9f7f0f931a4427bfbc762e8629fd1297b31
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 28 Nov 2013 19:44:13 +0800
Tag:    v2.6.1

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

commit 4942801c3969e01ad30988ae1909dffb07c94010
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 28 Nov 2013 19:44:04 +0800
Tag:    v2.7.0-beta

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

commit 62daeecc11cd7bf149445ba1fb3e6d6a73b85c4f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Nov 2013 04:30:46 +0800
Tag:    v2.4.8

Merge branch 'm24_MDL-43045' of git://github.com/totara/moodle into MOODLE_24_STABLE

commit 9703d42284fb0311283eb3af669afddf22121a3d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Nov 2013 04:30:31 +0800
Tag:    v2.5.4

Merge branch 'm25_MDL-43045' of git://github.com/totara/moodle into MOODLE_25_STABLE

commit a01d727a311b1fa60b37983dcdee7f3c74bf7872
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Nov 2013 04:28:25 +0800
Tag:    v2.6.1

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

commit 51e9d69af2312c812c96931e5aac947e71d10644
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Nov 2013 04:27:35 +0800
Tag:    v2.7.0-beta

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

commit 0ecaebd48710af2105a161b1898f768923c65c88
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sun, 24 Nov 2013 23:51:37 +0800
Tag:    v2.4.8

Merge branch 'wip-MDL-29071-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE

commit a24766c374e2042cdc802424fd246abd7104da61
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sun, 24 Nov 2013 23:51:12 +0800
Tag:    v2.5.4

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

commit 9d1a546fa004ad22768bcfda788c03e97d6de4ae
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 22 Nov 2013 02:33:47 +0800
Tag:    v2.7.0-beta

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

commit 7ce12c2d745aa241548a40f991373c490800a5de
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 22 Nov 2013 02:33:33 +0800
Tag:    v2.5.4

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

commit 9c3bfbfa3f278c157625bb53abbe31a7c47e9d1e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 22 Nov 2013 02:33:25 +0800
Tag:    v2.4.8

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

commit ad9e81eb981eaa1cbf40b1aa0ebc70c2a5ddbcd9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 15 Nov 2013 23:06:22 +0800
Tag:    v2.6.0

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

commit a3d0f7c7924c3bfd0ab56a49224f6d133d84dbeb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 15 Nov 2013 18:17:55 +0800
Tag:    v2.6.0-rc1

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

commit 55dc7b6be9b132e58c34bd5151caaf40da517790
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 15 Nov 2013 18:14:54 +0800
Tag:    v2.5.4

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

commit c250a0d330ecd3378af7b8e9ef69009446824973
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 15 Nov 2013 18:14:44 +0800
Tag:    v2.4.8

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

commit 850fd970cbad2fd626c835e765702ac12cea4d68
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 15 Nov 2013 09:14:15 +0800
Tag:    v2.5.4

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

commit 9a36c7d95c723c2f5e08acf184f40af3bbb20eff
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 15 Nov 2013 09:11:27 +0800
Tag:    v2.6.0-rc1

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

commit edab8082548cad95f213de6d1e40b17ea450a420
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 15 Nov 2013 09:07:01 +0800
Tag:    v2.4.8

Merge branch 'wip-MDL-42912-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE

commit 4233914802db0f9f507f9d76b6f4ad077a0a38e1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 15 Nov 2013 09:06:02 +0800
Tag:    v2.5.4

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

commit 234159ee9de524ce8415260d5173cf19bb7288ba
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 15 Nov 2013 09:04:45 +0800
Tag:    v2.6.0-rc1

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

commit a269acfef7beac743d0ce6a889767f27f04c76d8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 15 Nov 2013 06:24:20 +0800
Tag:    v2.6.0-rc1

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

commit 30d0332f0034b78edc63640a5374e197f466ab56
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 15 Nov 2013 06:22:26 +0800
Tag:    v2.6.0-rc1

Merge branch 'w47_MDL-42860_m26_dbsess' of https://github.com/skodak/moodle

commit 262edf64ca7beb601842d5918d8121a4aed98bbe
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 14 Nov 2013 06:15:51 +0800
Tag:    v2.5.4

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

commit 529d3bad0e7f127372574498c201aaa7f841383f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 14 Nov 2013 06:15:23 +0800
Tag:    v2.6.0-rc1

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

commit 474719d327fb5b5a7ccfff87136b963941f3a307
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 14 Nov 2013 06:09:09 +0800
Tag:    v2.6.0-rc1

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

commit 662c5263b03ff1762733066a4032f92f0e786b2e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Nov 2013 08:55:52 +0800
Tag:    v2.6.0-rc1

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

commit 5d4b5a560a71caacef0fd16c8816214981afb01f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Nov 2013 08:12:45 +0800
Tag:    v2.5.4

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

commit 56581299679933e6d1f27d53862a4c4bd366595b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Nov 2013 08:12:27 +0800
Tag:    v2.6.0-rc1

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

commit f77c1d2098cf26f94656fce4cae68e865c5631b0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Nov 2013 08:10:39 +0800
Tag:    v2.4.8

Merge branch 'MDL-42839-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE

commit d385005eaffdf5364654c85f7e409672d1d99036
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Nov 2013 08:10:20 +0800
Tag:    v2.5.4

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

commit 64dcfd6ea3eb69b95287835a473fcffb13c0baaa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Nov 2013 08:09:49 +0800
Tag:    v2.6.0-rc1

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

commit 183f84b5c31f9eb3762d427c8f5bebf21ace1b48
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Nov 2013 08:03:09 +0800
Tag:    v2.6.0-rc1

Merge branch 'wip_master_mdl-42723' of https://github.com/iarenaza/moodle

commit 4ac33ebc0512c5887120e8e5be8fc73d37886948
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Nov 2013 08:02:55 +0800
Tag:    v2.5.4

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

commit e39e0243b2eb1de12c889926ec3c80e119502ae3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Nov 2013 07:53:23 +0800
Tag:    v2.4.8

Merge branch 'wip_24_mdl-42723' of https://github.com/iarenaza/moodle into MOODLE_24_STABLE

commit ef2a27eac13cb15f94270c169132f7eddb8a1078
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Nov 2013 03:07:22 +0800
Tag:    v2.4.8

Merge branch 'wip-MDL-42672-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE

commit e17a5a4d21969f09f6efe62815a0ee2de18f1682
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Nov 2013 03:07:14 +0800
Tag:    v2.5.4

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

commit aa7bc816d9c7bda38eabe4c61f817664b4d7bf42
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Nov 2013 03:07:05 +0800
Tag:    v2.6.0-rc1

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

commit 201877b5d04c9a4ef324e3264a434442750e0324
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Nov 2013 10:27:22 +0800
Tag:    v2.6.0-rc1

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

commit 715cd44d3a7a8ea45b8ef0cbb422c794b0186ac7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Nov 2013 07:41:46 +0800
Tag:    v2.4.8

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

commit 3bf475dbfe629f5ca3fa8ea41d5b59e18c533d13
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Nov 2013 07:41:38 +0800
Tag:    v2.5.4

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

commit 5d875d18e00454e74223a17a82efb2360ebb0fdc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Nov 2013 07:38:35 +0800
Tag:    v2.6.0-rc1

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

commit e916eb407c2cf85d78d47a84d9783e9761158535
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Nov 2013 06:35:37 +0800
Tag:    v2.6.0-rc1

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

commit 233db99d65838b8c891388b6ba68714b9cca8ca7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 06 Nov 2013 00:27:04 +0800
Tag:    v2.6.0-rc1

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

commit a10883149732cd7ad56636a63523ff88b22e2351
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 25 Oct 2013 19:03:36 +0800
Tag:    v2.5.3

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

commit 8c92e24434f797d17cdb4dfe0d231b9d794b02ee
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 25 Oct 2013 19:03:27 +0800
Tag:    v2.4.7

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

commit 27ee4c13a51a4abdcb746c9ae0b694d73f4514ef
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 25 Oct 2013 07:14:04 +0800
Tag:    v2.6.0-rc1

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

commit 183058c8b577d04ac088e1de3767944b9619a660
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 25 Oct 2013 07:13:46 +0800
Tag:    v2.5.3

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

commit 3b34d79d3662adc2e5bd33298f87f93a97226358
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 25 Oct 2013 07:13:08 +0800
Tag:    v2.4.7

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

commit 7419751a4c05d32144474c6e98288f6ed7e8376a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 25 Oct 2013 07:09:25 +0800
Tag:    v2.6.0-rc1

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

commit 20ddc0c9cfbfcde9d807a50f33d5d696d8b61b39
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 25 Oct 2013 05:35:24 +0800
Tag:    v2.6.0-rc1

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

commit c783a415dca14721658110ea1a1104d0a1c20c18
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 25 Oct 2013 05:33:42 +0800
Tag:    v2.6.0-rc1

Merge branch 'w43_MDL-42442_m26_standardwhite' of https://github.com/skodak/moodle

commit d0285a0d9175cef73776326c51c428187de99d10
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 25 Oct 2013 05:27:11 +0800
Tag:    v2.6.0-rc1

Merge branch 'w43_MDL-42206_m26_metaedit' of https://github.com/skodak/moodle

commit bf928b293355185806d9fda8872acc17abcfe411
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Oct 2013 18:14:29 +0800
Tag:    v2.6.0-rc1

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

commit 059d7bd27547cf9bd716620e46a466fac65fb4a0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Oct 2013 21:19:36 +0800
Tag:    v2.6.0-beta

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

commit 11182e2eb1020fc63e91bc9526e72293dd7770ed
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Oct 2013 07:23:01 +0800
Tag:    v2.6.0-beta

Merge branch 'w42_MDL-42224_m26_msgredir' of https://github.com/skodak/moodle

commit 77631383f0c29c70bb4c8deefada8034a62bec00
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Oct 2013 07:04:36 +0800
Tag:    v2.6.0-beta

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

commit e60637052c6f4c7a945473812b9321c62d6eb73e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Oct 2013 06:39:46 +0800
Tag:    v2.6.0-beta

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

commit 9bb34fb7816bb6e17ede90d8e27580c6d3780e94
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 15 Oct 2013 08:09:11 +0800
Tag:    v2.6.0-beta

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

commit 3745472f635f92441c3d8d317410b645add2b9ad
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 15 Oct 2013 07:58:51 +0800
Tag:    v2.6.0-beta

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

commit 5864eb6017cd106981140496cd4e4147acbcd347
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Oct 2013 06:15:29 +0800
Tag:    v2.4.7

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

commit 88401c3494ae59af99de7c305140ff4281ae827b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Oct 2013 06:14:54 +0800
Tag:    v2.5.3

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

commit 7d766e4ca16db8d4effb28c59149f31d6bdcc41f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Oct 2013 06:13:26 +0800
Tag:    v2.6.0-beta

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

commit d9131593c7d8588059bb60db857a7420dd6bdcc6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Oct 2013 05:32:55 +0800
Tag:    v2.4.7

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

commit 2f334c64645cb624f0d242b04fa9495c6b2d9358
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Oct 2013 05:32:46 +0800
Tag:    v2.5.3

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

commit b1636b4a8b2f0c4c50cb0df7528d7f27058fc2af
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Oct 2013 05:32:30 +0800
Tag:    v2.6.0-beta

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

commit 04e49ead57193c9b18f3ed17cf7dcc20fc6ec421
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Oct 2013 05:19:18 +0800
Tag:    v2.6.0-beta

Merge branch 'w42_MDL-42243_m26_filtersettings' of https://github.com/skodak/moodle

commit f71011e825a92b501b0e7c618fedf84b5dfaed8e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Oct 2013 05:09:53 +0800
Tag:    v2.6.0-beta

Merge branch 'w42_MDL-42292_m26_blockversion' of https://github.com/skodak/moodle

commit 6ad40de4652dc77b31fb390ffdd199baab0dd724
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Oct 2013 00:30:49 +0800
Tag:    v2.6.0-beta

Merge branch 'w42_MDL-41935_m26_timediff' of https://github.com/skodak/moodle

commit 3ed255dc1a2f789fb05e005ad5d18fc910917ef6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 Oct 2013 07:33:21 +0800
Tag:    v2.6.0-beta

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

commit 4d4396c3b81151de19bdd3acd6988b9e1cc39fa0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 Oct 2013 06:47:30 +0800
Tag:    v2.6.0-beta

Merge branch 'w41_MDL-41953_m26_componentnumbers' of https://github.com/skodak/moodle

commit 7e9dadfd99c05dfe9a4437d07f4e3b979fd52ee6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Oct 2013 07:48:45 +0800
Tag:    v2.6.0-beta

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

commit 8fe9bbde098f07cce9dd37e30bdd28588136bec6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Oct 2013 07:29:17 +0800
Tag:    v2.6.0-beta

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

commit 38c6dc4313e392130fc9b9d8c1a479803d00b9ce
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Oct 2013 07:26:52 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-42068-m26-showshortnamefilepicker' of git://github.com/henesnarfel/moodle

commit 6257097a3f7e0ae358aeb1ea9ddb3ea840766c45
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Oct 2013 03:27:27 +0800
Tag:    v2.4.7

Merge branch 'MDL-42069_24' of https://github.com/appalachianstate/moodle into MOODLE_24_STABLE

commit 5e50cd9355be4b3303a1bde8c75eb94255e4c897
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Oct 2013 03:27:18 +0800
Tag:    v2.5.3

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

commit 7d19bc135372f5e0dc98776871b0287b9b7353da
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Oct 2013 03:25:46 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-42069' of https://github.com/appalachianstate/moodle

commit cef0f4203b54d6c60aa74485c2d4d91fc0c4406e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Oct 2013 03:23:56 +0800
Tag:    v2.6.0-beta

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

commit 467fc039826a2b3d902517ec3839e73354453c1e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 08 Oct 2013 16:53:03 +0800
Tag:    v2.6.0-beta

Merge branch 'w41_MDL-42199_m26_rev' of https://github.com/skodak/moodle

commit e68ff1ec32943e0419077bd4731d8cdeae027c38
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 07 Oct 2013 22:06:32 +0800
Tag:    v2.6.0-beta

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

commit 9d4ff1e5f40178adb3ca8e17f33a1601f9f6c2ed
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Oct 2013 06:26:20 +0800
Tag:    v2.6.0-beta

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

commit 3667a8ce7f26788fe1beec470735a2b88b3ead68
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Oct 2013 05:59:05 +0800
Tag:    v2.6.0-beta

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

commit d1ed736f1de7ae7f28d28dd72733ccb8d2aee6f9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Oct 2013 05:42:00 +0800
Tag:    v2.6.0-beta

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

commit 268f4cb5038a7de8bbed6c0fe098c214d6922297
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Oct 2013 02:08:25 +0800
Tag:    v2.6.0-beta

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

commit 098723aabb69854d08285dc56bcee949ffb6a9ab
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Oct 2013 02:01:33 +0800
Tag:    v2.6.0-beta

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

commit 46b23b69faba9e6668f3340dca619951715682df
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Oct 2013 01:56:27 +0800
Tag:    v2.5.3

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

commit 46e11c669022d42aeee558c03788b5ba9d4d420e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Oct 2013 01:55:30 +0800
Tag:    v2.6.0-beta

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

commit a348f55e3fc9ec429e30c06329a4c63958dae79a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Oct 2013 01:53:22 +0800
Tag:    v2.5.3

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

commit e360a68adc727447e557b8e07826f19c3cc6518e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Oct 2013 01:50:19 +0800
Tag:    v2.6.0-beta

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

commit da600e53141fdfea8817213738dc75ddd0612836
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Oct 2013 01:43:42 +0800
Tag:    v2.6.0-beta

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

commit 52e9827495740cd9937edb90e2754c087c7455a6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Oct 2013 01:41:10 +0800
Tag:    v2.6.0-beta

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

commit 164e90dd70726c1c342cafc20c4f6c311d377276
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Oct 2013 01:36:37 +0800
Tag:    v2.6.0-beta

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

commit 91c49b8cf4302b0a0ee6d847e4747158b4ae7e5f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Oct 2013 01:18:36 +0800
Tag:    v2.6.0-beta

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

commit 4ae75c18473c4f0699e354b6ba0b8758e45e907b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 01 Oct 2013 21:59:24 +0800
Tag:    v2.4.7

Merge branch 'w40_MDL-41999_m24_userpw' of https://github.com/skodak/moodle into MOODLE_24_STABLE

commit 3ee1a66de9c60ef01be9c9f1254fdfd958c8e2ca
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 01 Oct 2013 21:59:15 +0800
Tag:    v2.5.3

Merge branch 'w40_MDL-41999_m25_userpw' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 00a6df6b028280446c105c4ca1e7a98582839f0d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 01 Oct 2013 21:59:06 +0800
Tag:    v2.6.0-beta

Merge branch 'w40_MDL-41999_m26_userpw' of https://github.com/skodak/moodle

commit b744b90df54b3ed026b7cd6a47a695fb6b686806
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 01 Oct 2013 08:14:23 +0800
Tag:    v2.6.0-beta

Merge branch 'w40_MDL-41707_m26_exttests' of https://github.com/skodak/moodle

commit b1698e9ac578081797abe13bd52bf41aecce23bc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 01 Oct 2013 07:52:53 +0800
Tag:    v2.6.0-beta

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

commit 94211c02c33ef93e4be6c0f0161c750b8bb3aa51
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 01 Oct 2013 03:55:41 +0800
Tag:    v2.6.0-beta

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

commit 4b95721a260e9bfafae45133084fb5896f0cae55
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 30 Sep 2013 22:01:55 +0800
Tag:    v2.4.7

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

commit 69634029f53dc767f415e0eb2d119687a39568e4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 30 Sep 2013 22:01:46 +0800
Tag:    v2.5.3

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

commit 833d1eb0e2ab3cf306c93d8080e8ee439b0ba1c7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 30 Sep 2013 22:01:38 +0800
Tag:    v2.6.0-beta

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

commit 6da8594018a2cd5013490455e4fc1ab59867238d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 26 Sep 2013 05:48:42 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40811-master-behat' of https://github.com/andrewnicols/moodle

commit c72cad1f85e01fd8382b64260f91969b6780643f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 19:36:40 +0800
Tag:    v2.6.0-beta

Merge branch 'int_uninstall' of https://github.com/skodak/moodle

commit a07a9c74de68971c259fb6fa50bb0307aed1a313
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 17:41:45 +0800
Tag:    v2.6.0-beta

Merge branch 'w39_MDL-41208_m26_yui312' of https://github.com/skodak/moodle

commit d5971d75a1fa263f60e7d1f95d6da19304ec6b49
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 09:10:12 +0800
Tag:    v2.5.3

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

commit 1d453eff25dd596c7b1d2c62330b708abefb4311
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 09:09:51 +0800
Tag:    v2.6.0-beta

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

commit a943166fc1854315ef0073e3367c18ff3ca186b0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 08:49:10 +0800
Tag:    v2.5.3

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

commit 75c7c412831707ca2b15e93f1d5ae69e429f2e82
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 08:38:34 +0800
Tag:    v2.6.0-beta

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

commit 14976b35687e12241b03eaa73cc34eb01aaafdc6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 08:33:30 +0800
Tag:    v2.6.0-beta

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

commit 25e02ab6ee641ceeae97c74ac19574f15ec12d91
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 08:14:57 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41660-imscc-tempdir' of https://github.com/mpetrowi/moodle

commit 8ecd67c48e73b691b77c8866586beb17e303a863
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 08:13:22 +0800
Tag:    v2.5.3

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

commit a18daae62b173f9f7b60d782e2eb40362f91efcf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 08:11:51 +0800
Tag:    v2.6.0-beta

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

commit b152769f448e9a5320133e678ef10020fbea03de
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 08:00:47 +0800
Tag:    v2.4.7

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

commit 1cf52db9b4b74241143c0bb421be1f4ff5f890b4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 08:00:34 +0800
Tag:    v2.5.3

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

commit 109d6fe29014c4db7e647d9e2d761ad6d0841e67
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 08:00:22 +0800
Tag:    v2.6.0-beta

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

commit 24262f59481a65522a839f4d7e825c8e43c5273e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 07:01:23 +0800
Tag:    v2.6.0-beta

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

commit 007b803b4a014acf4d4a75eeec0d6a45e49241f1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 06:27:57 +0800
Tag:    v2.6.0-beta

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

commit 81eba750d4f5ad1e4921cf152b4c837a4da684da
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 05:23:15 +0800
Tag:    v2.6.0-beta

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

commit 4008db6d6aa2b54ed47aeaadedb0b2e5ead3c87a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 05:21:04 +0800
Tag:    v2.5.3

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

commit bbfa86fe483976248bbe0147ea2d63e2ca8265c6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 05:20:53 +0800
Tag:    v2.6.0-beta

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

commit 18ccaca2e2d125ab084a5f8a40ed222ecbd1d752
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 05:13:50 +0800
Tag:    v2.6.0-beta

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

commit 161f995849e552964c53e456165fd31c4952ed79
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 02:18:03 +0800
Tag:    v2.6.0-beta

Merge branch 'w39_MDL-41437_m26_mia' of https://github.com/skodak/moodle

commit dd0fa1adb1cf26205867c4158f3f034de90644d8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Sep 2013 20:05:10 +0800
Tag:    v2.6.0-beta

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

commit fe64d4f7c8df0ad5a9e21e80fc75d6de29231d8e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Sep 2013 04:05:26 +0800
Tag:    v2.6.0-beta

Merge branch 'int_install' of https://github.com/skodak/moodle

commit 9ea4eedf227076e34b8760e29beba94713999eea
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Sep 2013 23:09:25 +0800
Tag:    v2.6.0-beta

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

commit cae8956648259eb7b5fbb215056d98eb604e09b6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Sep 2013 21:44:31 +0800
Tag:    v2.6.0-beta

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

commit abef633c33c944387a72e129f1a36ab57ee479f2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Sep 2013 03:57:07 +0800
Tag:    v2.6.0-beta

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

commit dd344e37093e48ed9fc18301c1ff43d330e69a94
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Sep 2013 03:22:42 +0800
Tag:    v2.5.3

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

commit 5c34952b821bafc9c8ace3c43b00db9ad8947ec9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Sep 2013 03:22:30 +0800
Tag:    v2.6.0-beta

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

commit 6726f0073e9fa5a06500b05f3dd83479e22a163b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Sep 2013 03:18:48 +0800
Tag:    v2.4.7

Merge branch 'MDL-41728-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE

commit 23074741817e01667c9189bb8fee0973b5e80fa1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Sep 2013 03:18:34 +0800
Tag:    v2.5.3

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

commit cfcd93dd11d7335ff0b5116f2954fbd3a0dc9920
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Sep 2013 03:17:05 +0800
Tag:    v2.6.0-beta

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

commit e79ca991fb7be80d8179c749f21fb41e789174e6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Sep 2013 03:11:26 +0800
Tag:    v2.6.0-beta

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

commit 9336caebaa0e7cfa7dc5ba5df717729be9748df7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Sep 2013 02:29:59 +0800
Tag:    v2.5.3

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

commit e60756632aa97794cebb9ce6d4256c0034173f6e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Sep 2013 02:22:32 +0800
Tag:    v2.6.0-beta

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

commit 1ee2fb5a11b1d622502f08ea3f68785d84edd458
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Sep 2013 02:04:08 +0800
Tag:    v2.6.0-beta

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

commit 58c9faeaca7213fe284b7999fc77bff313d90582
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Sep 2013 01:59:55 +0800
Tag:    v2.6.0-beta

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

commit 657beb8924267cb2202ba78bec8d49b55970a744
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 Sep 2013 08:15:42 +0800
Tag:    v2.4.7

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

commit 69253612e41e7d4350d52bc48b82f4bd44e6e1f1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 Sep 2013 08:15:22 +0800
Tag:    v2.5.3

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

commit ba57caa349c2f2589ce32f7ac5df277167847a73
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 Sep 2013 08:15:06 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41595_M26' of git://github.com/lazydaisy/moodle

commit a13f06aec03a3caf6559c4d6f9aa253bfb1226ef
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 11 Sep 2013 05:45:20 +0800
Tag:    v2.6.0-beta

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

commit f073ea045eb4416048faface27e273a0d2502b0a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 10 Sep 2013 20:16:14 +0800
Tag:    v2.6.0-beta

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

commit 34ac96bf6d42463e3a869aefd7aa9bbb34887745
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 10 Sep 2013 20:09:34 +0800
Tag:    v2.6.0-beta

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

commit 5cfcc6a981f4991bfca6969051e87ca553973ef4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 07 Sep 2013 20:13:55 +0800
Tag:    v2.6.0-beta

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

commit 93e4ea20f20895cb49a2fee3ace554509e338e72
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 07 Sep 2013 20:11:59 +0800
Tag:    v2.5.2

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

commit f87559946253e7e8ef7ec1e987ae61095779db8e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Sep 2013 07:08:37 +0800
Tag:    v2.6.0-beta

Merge branch 'w36_MDL-41267_m26_toolsubplugins' of https://github.com/skodak/moodle

commit df7995e3a0df0b800daaaa16e0a75d47ff445bb5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Sep 2013 07:01:19 +0800
Tag:    v2.6.0-beta

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

commit f2900567a8aacbe4597e64fe47d4b00f89910a2a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Sep 2013 04:07:04 +0800
Tag:    v2.5.2

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

commit 58c80b03a85ef64e041f9784e1a37cd00949e6ef
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Sep 2013 02:38:53 +0800
Tag:    v2.6.0-beta

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

commit f82a082ae2609d3e45fe0546ec20bd93e095e203
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Sep 2013 21:12:19 +0800
Tag:    v2.6.0-beta

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

commit 247f3e95e7975c8003de49747d8af5bca5738902
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Sep 2013 21:11:41 +0800
Tag:    v2.5.2

Merge branch 'MDL-41568-en_fix-25' of git://github.com/mudrd8mz/moodle into MOODLE_25_STABLE

commit 75cf0245761d164a332b9f94f0d7e74eabde8715
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Sep 2013 21:11:22 +0800
Tag:    v2.4.6

Merge branch 'MDL-41568-en_fix-24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE

commit e034d84c4897d78cc711411e72d407625a57a209
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 02 Sep 2013 22:56:50 +0800
Tag:    v2.6.0-beta

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

commit d8669d5befd29528bf9a42c75dea6ff54f4976b5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 28 Aug 2013 03:00:52 +0800
Tag:    v2.4.6

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

commit 14616c145ff047ff24340522f3e31f52df2cd318
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 28 Aug 2013 03:00:28 +0800
Tag:    v2.5.2

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

commit 5c451460073dbeff9f625f6e25c5e3545ebb5b7c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 28 Aug 2013 03:00:12 +0800
Tag:    v2.6.0-beta

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

commit ee3433a44b53cbeb79fa86560a6281ec3aa9761d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 28 Aug 2013 01:46:32 +0800
Tag:    v2.4.6

Merge branch 'm24_MDL-41410_Move_Comment_To_Appropriate_Place' of https://github.com/scara/moodle into MOODLE_24_STABLE

commit 19ed5ae02f6089367b677134cab588f429ff031a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 28 Aug 2013 01:46:00 +0800
Tag:    v2.5.2

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

commit c718b49bfcf41ee7e66418bfc80dc45848dae100
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 28 Aug 2013 01:45:24 +0800
Tag:    v2.6.0-beta

Merge branch 'm26_MDL-41410_Move_Comment_To_Appropriate_Place' of https://github.com/scara/moodle

commit 154bc6b240e9e4652cad829df6f60bca28b2d996
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 05:42:11 +0800
Tag:    v2.6.0-beta

Merge branch 'w30_MDL-40642_m26_umask' of https://github.com/skodak/moodle

commit 8f9b2980b783adb52fb842adb87d875483a08d10
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 05:21:38 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39704_master' of https://github.com/nadavkav/moodle

commit 7613bc7c3a5ea1f3242d0bc8a4fdf8441bd9c16b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 05:06:35 +0800
Tag:    v2.6.0-beta

Merge branch 'w30_MDL-40801_m26_jquery' of https://github.com/skodak/moodle

commit 8c573a95364c585b41d1cc9be767e28ca8354f00
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 05:04:13 +0800
Tag:    v2.6.0-beta

Merge branch 'w30_MDL-40627_m26_extramemorylimit' of https://github.com/skodak/moodle

commit ae2605ec8d73e8da4b420bfcdc5b9f2629899d38
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 04:56:34 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-40540-m26' of git://github.com/samhemelryk/moodle

commit 01994ecee98c7974398962550b7cb33e2984fc67
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 04:39:13 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40544_master' of https://github.com/nadavkav/moodle

commit 6aa9735cb0c2065eaefdb2f04b6479e541c9128e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 04:34:16 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40589_master' of https://github.com/nadavkav/moodle

commit 6abf3556fd8e1c34abf6a336e1c5a0e962813d82
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 04:28:54 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40189_master' of https://github.com/nadavkav/moodle

commit 172dda0090d5ff8f9421e633a0b724416a7a99cc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 04:10:08 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40071_master' of https://github.com/nadavkav/moodle

commit 18c4d7e68cc8eae1d5ce503adabb8e77c425817a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 02:32:40 +0800
Tag:    v2.6.0-beta

Merge branch 'w30_MDL-40723_m26_creators' of https://github.com/skodak/moodle

commit cbc4aa8cfe68e13fcf43859ac8d3949ce4ce5aaf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 02:29:43 +0800
Tag:    v2.6.0-beta

Merge branch 'w30_MDL-40796_m26_citycountry' of https://github.com/skodak/moodle

commit 070a1bf23fe11397da0d8679e04ec1e5a2b37781
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 00:58:03 +0800
Tag:    v2.6.0-beta

Merge branch 'w30_MDL-40809_m26_olduserimages' of https://github.com/skodak/moodle

commit 8b8bd17aac697ce042148528ce57f728148a7bfe
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 00:21:19 +0800
Tag:    v2.4.6

Merge branch 'w30_MDL-40679_m24_zlib' of https://github.com/skodak/moodle into MOODLE_24_STABLE

commit 1bb7b654966813b04cda65348ba5774a3824e459
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 00:21:09 +0800
Tag:    v2.5.2

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

commit 288ba37a56f45f4dfe5cc7c9b502619023cd314c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 00:20:50 +0800
Tag:    v2.6.0-beta

Merge branch 'w30_MDL-40679_m26_zlib' of https://github.com/skodak/moodle

commit d03c0ef72d3e6b9ca40c069600116b1bf0c8a379
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 00:19:32 +0800
Tag:    v2.5.2

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

commit 79143f1e597531fc00de6b3b653bb0df51c5562e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 00:18:52 +0800
Tag:    v2.6.0-beta

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

commit 9655e2e335f7e489644faf7d969da1ebf68a47a1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 00:01:28 +0800
Tag:    v2.4.6

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

commit c8dd490281ae6d8881a1b44f03e7f8d0a1b3be3b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 00:01:19 +0800
Tag:    v2.5.2

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

commit 30a209ba1762c33f1719bbe2d96bcc4e3629115a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 23:50:38 +0800
Tag:    v2.6.0-beta

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

commit 97c51dfb2236527f6004923fd1b4683121f94173
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 23:45:22 +0800
Tag:    v2.6.0-beta

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

commit 2c72cc23b2ce21881f80fcb95603074e38b9facf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 23:17:13 +0800
Tag:    v2.6.0-beta

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

commit 4e60c378cfbbdd8784164eca962c68c365c44a82
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 19:58:46 +0800
Tag:    v2.4.6

Merge branch 'wip-MDL-40700-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit 52affa8a9a888efe4f5b7b5e2f093af313623a1a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 19:58:30 +0800
Tag:    v2.5.2

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

commit 9e1e94aafab6ac9581b5f37e75983fcbf2b11a50
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 19:58:20 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-40700-m26' of git://github.com/samhemelryk/moodle

commit aa837b2fe65221c2c436b6f35b7b7fcce6c3e4d9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 19:50:06 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-40762-m26' of git://github.com/samhemelryk/moodle

commit e988493e68461b1e1bfc0fcc222e2b32dc3e4411
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 19:19:54 +0800
Tag:    v2.5.2

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

commit 8c2ed5704382ca5a58aaeb63037f5253193b4a21
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 19:19:41 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-40763-m26' of git://github.com/samhemelryk/moodle

commit d4731fd002bb8b2e1e93d1eb71ceefc659719e08
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 18:52:50 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-40677-m26' of git://github.com/samhemelryk/moodle

commit 3b117e79ce4092fc578897072586885468dd7c5d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 18:16:11 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40082_master' of https://github.com/nadavkav/moodle

commit 932ad50a6ef395cbdf9247c08677ea21d6200dbf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 09:52:23 +0800
Tag:    v2.5.2

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

commit 4238060a9b1a342e91082c6e7b56b6e255b9ae09
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 09:52:16 +0800
Tag:    v2.6.0-beta

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

commit 2f956f40b6a79ed57149ab13da1af19c8db52e98
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 07:09:20 +0800
Tag:    v2.5.2

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

commit 6d0085ef2447c88ee171749c61eb4f5f247128f2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 06:48:47 +0800
Tag:    v2.6.0-beta

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

commit e024b7130afe7433e7cf26d1749630d493a6bd46
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 06:45:20 +0800
Tag:    v2.5.2

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

commit 63ff2c5c2faca20c419319782abc20d4c08e49c5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 06:45:13 +0800
Tag:    v2.6.0-beta

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

commit ed3a28dcecd483ed32538798bfeb96d91c3d38d8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 04:36:33 +0800
Tag:    v2.5.2

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

commit f2515968d2ae776f351c8aa46f80aa16cdae61fa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 04:36:23 +0800
Tag:    v2.6.0-beta

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

commit 59af378baf1262be95c83e902dab16f8616b1ed0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 00:56:40 +0800
Tag:    v2.6.0-beta

Merge branch 'w30_MDL-40795_m26_ajaxerrordisplay' of https://github.com/skodak/moodle

commit 9260f1bdd2bdc5f12cbad05324acaf02696804d7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 22 Jul 2013 23:41:07 +0800
Tag:    v2.4.6

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

commit 55be97fba49cb9adbe6247e9f4c21c229aa72445
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 22 Jul 2013 23:41:01 +0800
Tag:    v2.5.2

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

commit 252e545e9fbc5c1d523955e3fab47358c5a94d63
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 22 Jul 2013 23:40:03 +0800
Tag:    v2.6.0-beta

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

commit dbdfd37709a5df194bd9cfda3ce352e5ad5b7448
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 19 Jul 2013 02:22:47 +0800
Tag:    v2.6.0-beta

Merge branch 'wip_MDL-40074' of https://github.com/jamiepratt/moodle

commit fb1788c598b4e3076492ad50de72a2734e0ddcdf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 07:21:51 +0800
Tag:    v2.6.0-beta

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

commit 68d9f1327306b12aab6c908dc90d52b16bf50b2b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 07:13:17 +0800
Tag:    v2.6.0-beta

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

commit 0b3af0798c291d7796ec6f910a2650b3a20f7f55
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 07:07:21 +0800
Tag:    v2.6.0-beta

Merge branch 'w29_MDL-40220_m26_core_component' of https://github.com/skodak/moodle

commit afda9e227926ced24d3278f754a662abecd6660e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 06:58:26 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-40634-m26' of git://github.com/samhemelryk/moodle

commit a6149155c0efee649452adf94b852e8301f9947b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 06:43:45 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-40635-m26' of git://github.com/samhemelryk/moodle

commit b5d967cb1defa01eb26b34b406eebf7698309a26
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 06:41:19 +0800
Tag:    v2.5.2

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

commit f28051143f45c35afe33430e47df524a2207ae60
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 06:41:15 +0800
Tag:    v2.6.0-beta

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

commit d76bba6e24bb3f0fa02685f0e1c6deaae740d667
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 06:32:44 +0800
Tag:    v2.4.6

Merge branch 'w29_MDL-40611_m24_accesslibtest' of https://github.com/skodak/moodle into MOODLE_24_STABLE

commit c59f83cec25e62cf0564a7dbb7147e14962e73a0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 06:32:37 +0800
Tag:    v2.5.2

Merge branch 'w29_MDL-40611_m25_accesslibtest' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 2be11851321a1397eaa2ec82150f6116fddcaae0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 06:32:32 +0800
Tag:    v2.6.0-beta

Merge branch 'w29_MDL-40611_m26_accesslibtest' of https://github.com/skodak/moodle

commit b8d73bd58e317e22b76d3b875835d17dfcc0d47e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 06:30:13 +0800
Tag:    v2.6.0-beta

Merge branch 'w29_MDL-40546_m26_jscache' of https://github.com/skodak/moodle

commit d8bbfdfbe050cdb698117c508a7bf6cb0f92321a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 06:26:57 +0800
Tag:    v2.4.6

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

commit cbd227ffae92511dac0dada922e06d719dbaea0a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 06:26:43 +0800
Tag:    v2.5.2

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

commit a9802619840c45edd4119825503988b548c8895a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 06:24:10 +0800
Tag:    v2.6.0-beta

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

commit 660ee07b60a305602d7e212eae83935c417d6945
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 06:22:15 +0800
Tag:    v2.6.0-beta

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

commit bc27ec579e036bd89d7e8252d0b08376a095f8fa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 06:17:43 +0800
Tag:    v2.5.2

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

commit 3742ee163b3c90e73abe389cf634f71095e91863
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 06:17:30 +0800
Tag:    v2.6.0-beta

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

commit 980746ce63ea1e6c8545d1f37e96b61c0c1bb521
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 04:02:23 +0800
Tag:    v2.5.2

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

commit 55fcd9323e95aabe7c74d0d2883b8e4fed8e05fc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 04:02:18 +0800
Tag:    v2.6.0-beta

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

commit 2ff8b13dee0b3d8ee860366991eff3790853b101
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 03:55:55 +0800
Tag:    v2.5.2

Merge branch 'w29_MDL-40423_m25_localsubdir' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit e28ae962be4601928f0d2dc90dc6cfa595805004
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 03:55:46 +0800
Tag:    v2.6.0-beta

Merge branch 'w29_MDL-40423_m26_localsubdir' of https://github.com/skodak/moodle

commit 88ad6d0a999df2cd0fcd8bbfc527e216e8a73ebe
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Jul 2013 21:29:03 +0800
Tag:    v2.6.0-beta

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

commit 5b0804c4b19200088e293e7817fa4583da21f4fb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Jul 2013 17:41:47 +0800
Tag:    v2.6.0-beta

Merge branch 'w29_MDL-40563_m26_themecaching' of https://github.com/skodak/moodle

commit 3f0a8871d3f819b8d314133a4ae23fa419fdcaa5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Jul 2013 15:57:34 +0800
Tag:    v2.6.0-beta

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

commit d9debeb038600a3c94f1d4f9d9a921d36b0cee4a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Jul 2013 15:55:34 +0800
Tag:    v2.4.6

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

commit aeee792c86a2ef29d3f0dd85c5cfb7449b1aca54
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Jul 2013 15:46:27 +0800
Tag:    v2.5.2

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

commit e780e5cb8ff91a2bd3651c8e89284bfd188b20a1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Jul 2013 07:29:01 +0800
Tag:    v2.6.0-beta

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

commit ed405efb4c686e7d80fe0732e30d763fddff6e90
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Jul 2013 06:26:51 +0800
Tag:    v2.5.2

Merge branch 'w29_MDL-40571_m25_adminblocks' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit adbdb9b5c7d6b287231d9e3f224b53ac03a8357a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Jul 2013 06:26:44 +0800
Tag:    v2.6.0-beta

Merge branch 'w29_MDL-40571_m26_adminblocks' of https://github.com/skodak/moodle

commit 40aa1f4d88a75090de41a597c2028143c6a0f624
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Jul 2013 04:08:09 +0800
Tag:    v2.5.2

Merge branch 'MDL-40412_m25' of git://github.com/merrill-oakland/moodle into MOODLE_25_STABLE

commit 88e4c0848a04b9006ddfa620376182fa34793404
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Jul 2013 04:07:47 +0800
Tag:    v2.6.0-beta

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

commit 174405bd5ddf113c8355ad58864c85af4e15e53e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 15 Jul 2013 23:07:05 +0800
Tag:    v2.4.6

Merge branch 'wip-MDL-38747-MOODLE_24_STABLE' of https://github.com/satrun77/moodle into MOODLE_24_STABLE

commit ad92b2f1ae60b8496d729ed2bd377fad923b03ef
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 15 Jul 2013 23:06:31 +0800
Tag:    v2.5.2

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

commit 37aa0545a1e69dc532fa92b89cbd7f6c7104f99c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 15 Jul 2013 23:02:01 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-38747-master' of https://github.com/satrun77/moodle

commit 619658b877c67021df6d983d8947ae6caabfbe47
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Jul 2013 17:36:29 +0800
Tag:    v2.6.0-beta

Merge branch 'moduleuninstallfix' of https://github.com/skodak/moodle

commit 620e1e37872a92291ca43264df8bd28259bb453d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Jul 2013 17:34:55 +0800
Tag:    v2.6.0-beta

Merge branch 'w27_MDL-39088_m26_uninstall' of https://github.com/skodak/moodle

commit cfe8b6df3320ff3fc548a621c89f810ba89c5816
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Jul 2013 03:52:17 +0800
Tag:    v2.6.0-beta

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

commit 7b2ca655745fe57f20fca66be875a599ee08c6ff
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Jul 2013 03:22:30 +0800
Tag:    v2.6.0-beta

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

commit 1a5986dab9ffc3e3d17539d47e9bcc4d2dab70c7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Jul 2013 03:12:10 +0800
Tag:    v2.5.1

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

commit aefc66dd35203188c7aab154b5ee29a7ea44a437
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Jul 2013 03:11:49 +0800
Tag:    v2.6.0-beta

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

commit c946f60b0d6ef3848d9db2dbd5e17beb41864904
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Jul 2013 01:41:44 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40314_M26' of git://github.com/lazydaisy/moodle

commit 1203222a3c98c3da282c0da78c68bb85b1aed49a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 20:27:34 +0800
Tag:    v2.6.0-beta

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

commit a9155c2875adeada1bc4680bcb89f8d1d00facf1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 20:27:24 +0800
Tag:    v2.5.1

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

commit 3c2e7a0e7cc87b581a051a0356019599d165d19e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 20:09:11 +0800
Tag:    v2.6.0-beta

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

commit cb4beb2d2cd9ab565b857166de6f6e6cd9600c37
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 19:48:02 +0800
Tag:    v2.4.5

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

commit 4d52fbbc143eb03851c1fe121eb1446a53851156
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 19:47:37 +0800
Tag:    v2.5.1

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

commit 8b180f2317ec65716aa978b1b7864a63186ff057
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 19:47:09 +0800
Tag:    v2.6.0-beta

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

commit 490bf4e84ff7495615e87240499c1d622a6f8280
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 06:47:00 +0800
Tag:    v2.3.8

Merge branch 'get_users_by_capability_fix_m23' of http://github.com/timgus/moodle into MOODLE_23_STABLE

commit ea0b123d07bf91e9130af4d1d5fd80b6fe9d1035
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 06:46:51 +0800
Tag:    v2.4.5

Merge branch 'get_users_by_capability_fix_m24' of http://github.com/timgus/moodle into MOODLE_24_STABLE

commit f1293083a2f4f6970baa6a4221b5d9844b303877
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 06:46:38 +0800
Tag:    v2.5.1

Merge branch 'get_users_by_capability_fix_m25' of http://github.com/timgus/moodle into MOODLE_25_STABLE

commit 9a6a2d1ce07f875932f5f2aadd5e537882fb17fb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 06:46:30 +0800
Tag:    v2.6.0-beta

Merge branch 'get_users_by_capability_fix_master' of http://github.com/timgus/moodle

commit c6638cd6ce6c4bebabd16d42544becaf212baa6b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 06:43:31 +0800
Tag:    v2.6.0-beta

Merge branch 'w27_MDL-39088_m26_uninstall' of https://github.com/skodak/moodle

commit f5dc7f2c2a94f23a8e302638644ef8d4b07ea836
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 05:14:36 +0800
Tag:    v2.2.11

Merge branch 'w27_MDL-39754_m22_evn26' of https://github.com/skodak/moodle into MOODLE_22_STABLE

commit 16b73cf30d5fcb18fcc2171e44a05fb1b7f373b0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 05:14:26 +0800
Tag:    v2.3.8

Merge branch 'w27_MDL-39754_m23_evn26' of https://github.com/skodak/moodle into MOODLE_23_STABLE

commit 8ae15861dee3f400092543e096406efa71f7ba21
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 05:14:16 +0800
Tag:    v2.4.5

Merge branch 'w27_MDL-39754_m24_evn26' of https://github.com/skodak/moodle into MOODLE_24_STABLE

commit 2bc8f2160018810e57bc3e4f758ed7576d8eb08a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 05:14:05 +0800
Tag:    v2.5.1

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

commit dfd851be7c2181420dd28e3b2738ae5308f43060
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 05:13:39 +0800
Tag:    v2.6.0-beta

Merge branch 'w27_MDL-39754_m26_evn26' of https://github.com/skodak/moodle

commit 75b8d4a1465e2f1178ffdc9a824ec0e573ab5a1b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 00:02:32 +0800
Tag:    v2.5.1

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

commit e4bb5050a6ab481a6f858ead217fb9aa9300e807
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 01 Jul 2013 23:59:06 +0800
Tag:    v2.6.0-beta

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

commit 2624a2edf4050834d06d9d683d17354ad7b3867e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 28 Jun 2013 02:05:44 +0800
Tag:    v2.3.8

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

commit dc565470794d592a898f170176909bc0bd5be338
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 28 Jun 2013 02:05:24 +0800
Tag:    v2.4.5

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

commit 97a7b6a7aa985b2ec77fc944837f970cf3f7fe48
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 28 Jun 2013 02:05:10 +0800
Tag:    v2.5.1

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

commit 20e511a9acecf4e813f86fec4fe62d99c25ebf66
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 28 Jun 2013 02:04:35 +0800
Tag:    v2.6.0-beta

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

commit 866ab6e1ce0834062b2a2b6f86b2ce08e4001fb3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 26 Jun 2013 18:30:51 +0800
Tag:    v2.5.1

Merge branch 'w26_MDL-39701_m25_filterupgrade' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 26568ba86584f65245934154db76e63f4fbf0a8d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 26 Jun 2013 18:30:41 +0800
Tag:    v2.6.0-beta

Merge branch 'w26_MDL-39701_m26_filterupgrade' of git://github.com/skodak/moodle

commit 74618f31d276d6c8a60074f97369fa35edd95db8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 22:28:22 +0800
Tag:    v2.6.0-beta

Merge branch 'w26_MDL-17081_m26_roles2' of git://github.com/skodak/moodle

commit 3166c21471751e5d7eb4ead30f12f4ad931d6f40
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 18:08:25 +0800
Tag:    v2.5.1

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

commit 09579cd1982d1babc16f8fdeeb96e22166c81db2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 18:08:15 +0800
Tag:    v2.6.0-beta

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

commit 7f5c46db8c44fb0b8a562c89cbc25c24b63e4612
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 07:42:17 +0800
Tag:    v2.6.0-beta

Merge branch 'w26_MDL-17081_m26_roles2' of git://github.com/skodak/moodle

commit e9d80e664b9f1c0e629e57eed4237a9d0bc9ae79
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 03:29:13 +0800
Tag:    v2.5.1

Merge branch 'w26_MDL-40233_m25_frontset' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 65ab140e00ed9770c21aa5c3023031e17e38429c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 03:29:05 +0800
Tag:    v2.6.0-beta

Merge branch 'w26_MDL-40233_m26_frontset' of git://github.com/skodak/moodle

commit 293aba00b7dc02e43980a46424e9331af12a3ab7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 03:24:00 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40264-essay-zero' of git://github.com/ktemkin/moodle

commit ffc480afbd60d4851cbeff1f69da8db5d3f7a0ab
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 03:23:43 +0800
Tag:    v2.5.1

Merge branch 'MDL-40264-m25-essay-zero' of git://github.com/ktemkin/moodle into MOODLE_25_STABLE

commit 1de08a0e60e0dcd2c3137905a5aacdfeea3bc961
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 03:23:34 +0800
Tag:    v2.4.5

Merge branch 'MDL-40264-m24-essay-zero' of git://github.com/ktemkin/moodle into MOODLE_24_STABLE

commit 2928ac025c98578c55dc94e593c1ae051537eb0b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 03:22:06 +0800
Tag:    v2.3.8

Merge branch 'MDL-40264-m23-essay-zero' of git://github.com/ktemkin/moodle into MOODLE_23_STABLE

commit 3d4a0f28875a3094c1e032fcd9c820c6bb677da0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 03:13:06 +0800
Tag:    v2.5.1

Merge branch 'w26_MDL-40254_m25_flatfile' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 1d04b481dd32ca400dcb0378af7500ab44e6fa0a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 03:13:01 +0800
Tag:    v2.6.0-beta

Merge branch 'w26_MDL-40254_m26_flatfile' of https://github.com/skodak/moodle

commit b19d21e26bd33aaa6903af9c18a60c46eedf6c33
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 02:21:55 +0800
Tag:    v2.3.8

Merge branch 'MDL-34610_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 4207e4771a2fa48b63fc4023941951997de659f9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 02:21:47 +0800
Tag:    v2.4.5

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

commit 9067595bf315d3b7887ba890817d73d2ead0cdb8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 02:21:30 +0800
Tag:    v2.5.1

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

commit 283dd00b7ebc421375676e3f68a6cbd6ec5d6c3a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 02:21:22 +0800
Tag:    v2.6.0-beta

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

commit c55a7ac5b058ee6655d99a2207ac707a45b4ab58
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 01:26:49 +0800
Tag:    v2.3.8

Merge branch 'MDL-40255_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit 81c7328717ab2a1f983fa5dba0847ece807089aa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 01:26:32 +0800
Tag:    v2.4.5

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

commit 94a541f7ff8fcc38548a9d2b3c54e24745f4362b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 01:26:22 +0800
Tag:    v2.5.1

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

commit b662b8576d86d5c41d95cfcc7582d6de6a606731
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 01:25:53 +0800
Tag:    v2.6.0-beta

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

commit 3e6f11b240b3e607edfae40aec50863bc533483b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 01:00:43 +0800
Tag:    v2.5.1

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

commit 75413055d0a62ad68e6eab762ef45f3be1cf2c41
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 01:00:33 +0800
Tag:    v2.6.0-beta

Merge branch 'm26_MDL-40200_Notices_When_Viewing_Profile_Invalid_UserId' of https://github.com/scara/moodle

commit e2eccd0952b00278c4fdae79ab49a9686e25015f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 00:56:08 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40258_master' of git://github.com/sam-moodle/moodle

commit 4cd8979c42bec2fd35881c6bdab30807711ba39a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 24 Jun 2013 23:23:29 +0800
Tag:    v2.6.0-beta

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

commit 3093713382abe6ba205e1434187c631489f317f9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 24 Jun 2013 21:39:07 +0800
Tag:    v2.6.0-beta

Merge branch 'w26_MDL-17081_m26_roles2' of git://github.com/skodak/moodle

commit 952cd137965248b5f74a7a1b98444fe54c450fa8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Jun 2013 16:37:45 +0800
Tag:    v2.6.0-beta

Merge branch 'fix_classloading5' of git://github.com/skodak/moodle

commit 5e069cbd969540ce5c1100f515c1a9d657b5dc58
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Jun 2013 07:45:27 +0800
Tag:    v2.5.1

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

commit 421e6decf49e02baf00f1a7c08ee263756fd3fb3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Jun 2013 07:43:57 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-40137-m26' of git://github.com/samhemelryk/moodle

commit 96c90fab6ad066029c9f91c6142a76ac618da611
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Jun 2013 07:30:07 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40103_temptable' of https://github.com/mr-russ/moodle

commit 5cc26839e79d05735371e952a0cb3d1365195242
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Jun 2013 06:56:11 +0800
Tag:    v2.5.1

Merge branch 'w25_MDL-40210_m25_badgescaps' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 57ed9d90c7d76da8256479b57cd66eb799d289d4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Jun 2013 06:55:53 +0800
Tag:    v2.6.0-beta

Merge branch 'w25_MDL-40210_m26_badgescaps' of git://github.com/skodak/moodle

commit f49cd5fcd8551595cd79b60f763d0fb2f53bd711
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Jun 2013 06:48:50 +0800
Tag:    v2.3.8

Merge branch 'MDL-33562-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit 392aa3ff35914f88b0c458a6c311f0e4a9de2ba1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Jun 2013 06:46:59 +0800
Tag:    v2.4.5

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

commit a831f154aed9764d50d2273360a99a12587f9ca6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Jun 2013 06:44:17 +0800
Tag:    v2.5.1

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

commit a48dad1fe1259a39189707ab0ab46dd223ea3a4c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Jun 2013 06:40:36 +0800
Tag:    v2.6.0-beta

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

commit 61899ac202f9dbbe07d198385c5321b54b122b08
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 06 Jun 2013 01:32:14 +0800
Tag:    v2.5.1

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

commit b21a6e26fa36c5521fcc3f5b0aa0eeca93090dfa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 06 Jun 2013 01:31:53 +0800
Tag:    v2.6.0-beta

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

commit 92c46e00eb10fa0ec0c5b5c61aee98bac60716a2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 22:24:22 +0800
Tag:    v2.5.1

Merge branch 'w23_MDL-39588_m25_ociinstall' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 33a54457ca41efe96cca8b9e574bd1b0998e19a9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 22:22:58 +0800
Tag:    v2.6.0-beta

Merge branch 'w23_MDL-39588_m26_ociinstall' of git://github.com/skodak/moodle

commit 1127607bce385db74de59487fb24668dbbe800ea
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 22:18:01 +0800
Tag:    v2.5.1

Merge branch 'w23_MDL-39503_m25_signup' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit cd8e9b19c5e4a59e67ad8e70111f22c69e1d83a1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 22:10:39 +0800
Tag:    v2.6.0-beta

Merge branch 'w23_MDL-39503_m26_signup' of git://github.com/skodak/moodle

commit a07b82a9bb4ca9cb3c512e18a78f68afbb4ad2b0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 16:45:19 +0800
Tag:    v2.3.8

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

commit 520f2926996a5066580c08a7c96c030e32fff7ea
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 16:36:31 +0800
Tag:    v2.4.5

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

commit ef580461f69a77b356151f9eb25e0ef40449bf30
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 16:36:22 +0800
Tag:    v2.5.1

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

commit 6c1c8b8ce0ea72b8e6f6982c62021bbf8c1d86b2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 16:36:16 +0800
Tag:    v2.6.0-beta

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

commit 960a3215448213ea4334bfb37510b0551d3bd711
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 08:46:40 +0800
Tag:    v2.4.5

Merge branch 'mdl24-MDL-39409-auth-cas-use-moodle-web-proxy' of https://github.com/brki/moodle into MOODLE_24_STABLE

commit 371bf22cc6931c9acfff5e97db6ba6faafe556bb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 08:45:37 +0800
Tag:    v2.6.0-beta

Merge branch 'master-MDL-39409-auth-cas-use-moodle-web-proxy' of https://github.com/brki/moodle

commit f21e4e5b5f28547612e0c720e7bae240d9d5e146
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 08:44:11 +0800
Tag:    v2.3.8

Merge branch 'w23_MDL-39416_m23_pagelog' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 13c6a81607c0c72f3a6a1f265d3cd3f99efd538a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 08:43:59 +0800
Tag:    v2.4.5

Merge branch 'w23_MDL-39416_m24_pagelog' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit ea85ee6f63410042cab5cbe62e0cabf76a593d64
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 08:43:48 +0800
Tag:    v2.5.1

Merge branch 'w23_MDL-39416_m25_pagelog' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 8c07c404be2127d952c79a9577ee27e65dadf22d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 08:43:21 +0800
Tag:    v2.6.0-beta

Merge branch 'w23_MDL-39416_m26_pagelog' of git://github.com/skodak/moodle

commit 796b57ea0bf1e059106e609d037f74bbc5127b08
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 08:32:29 +0800
Tag:    v2.6.0-beta

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

commit 03cfbefbffc872abd504fba5be986cc002ba0224
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 08:31:10 +0800
Tag:    v2.3.8

Merge branch 'MDL-38731-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit f078a515c799f25999cc2c3092731f4c933709f1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 08:31:04 +0800
Tag:    v2.4.5

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

commit 832aa7eb718b08bcdd56fc2f9f5175edc59455c8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 08:30:56 +0800
Tag:    v2.5.1

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

commit eb5bc31d2488d3999d24ddd2df1d5b6bb41366ed
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 08:29:43 +0800
Tag:    v2.6.0-beta

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

commit c47cd3442f1ed0db794dbf71d00fd4f07253f906
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 08:27:49 +0800
Tag:    v2.3.8

Merge branch 'MDL-37332-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit 58d9daa435558a5210d59af361d6d4464fb7c348
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 08:27:41 +0800
Tag:    v2.4.5

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

commit 0e73df9df61e7d3c2a43598d5ef0770af0279207
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 08:27:35 +0800
Tag:    v2.5.1

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

commit 28820155d1bc79c8cc591ad9af109270d254492a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 08:27:08 +0800
Tag:    v2.6.0-beta

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

commit 416b9b380337b61784719a2b1197ddccf21bd7ba
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 08:23:21 +0800
Tag:    v2.4.5

Merge branch 'm24_MDL-38545_PHP_Strict_error' of https://github.com/scara/moodle into MOODLE_24_STABLE

commit 3294f68f4aa6ac278a8837644a17ea524fcd0f0e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 08:22:22 +0800
Tag:    v2.6.0-beta

Merge branch 'm25_MDL-38545_PHP_Strict_error' of https://github.com/scara/moodle

commit ef8a1c4908995aa9b224f7efd52c817db4b1acf8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 07:45:28 +0800
Tag:    v2.5.1

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

commit 92b8d952f1011e4f0a92493b7b3da86064ff3d80
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 07:43:34 +0800
Tag:    v2.3.8

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

commit b0237a093fde9cb51be749be3ede4cc5b9329e41
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 07:43:25 +0800
Tag:    v2.4.5

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

commit 0f51a82bae7faab933612d14983583dff64c7b1c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 07:43:11 +0800
Tag:    v2.5.1

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

commit 32ce8b6803b1387bd40156c4040971632fc5a9e3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 07:43:03 +0800
Tag:    v2.6.0-beta

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

commit 8c8b3eba2479e99a69a07ca77487d5954584dd49
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 23:48:57 +0800
Tag:    v2.5.1

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

commit 79452da1c88e9df88af2f3213f65cf1036f9ee15
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 23:47:45 +0800
Tag:    v2.6.0-beta

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

commit 1fe7be205c5b3e9f0aa3bc7216cbc4988a5936c0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 07:58:27 +0800
Tag:    v2.5.1

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

commit b50ddbdbd5a72ae5f1354e72ed29cf4cc9463332
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 07:51:10 +0800
Tag:    v2.6.0-beta

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

commit 7b78c24ba074e2fbb7fb83c7a0c4a5691ac502b1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 07:44:57 +0800
Tag:    v2.3.8

Merge branch 'wip-MDL-39764_M23_3' of git://github.com/gjb2048/moodle into MOODLE_23_STABLE

commit b4a8c66cca1ca687a04d60bd7a5a5e9743296e0d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 07:44:11 +0800
Tag:    v2.4.5

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

commit 8a2cee5091bc5f3874ae436baa1b8e08b0dfc2a7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 07:43:28 +0800
Tag:    v2.5.1

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

commit 00169e862eeeb91f08f62b25beb5f1e59e0ce26a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 07:36:16 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-39764_master_3' of git://github.com/gjb2048/moodle

commit ca7f399be73d5f2170272711d227680de6d5ce87
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 07:32:12 +0800
Tag:    v2.5.1

Merge branch 'w23_MDL-39882_m25_behatconfig' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit fd4c01566ee7a8ee5d8af74e91a33e9e0f0afa54
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 07:31:54 +0800
Tag:    v2.6.0-beta

Merge branch 'w23_MDL-39882_m26_behatconfig' of git://github.com/skodak/moodle

commit 422595e28243be739c78d43b4bd497575b024e4a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 07:14:09 +0800
Tag:    v2.6.0-beta

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

commit 618737d7e9e532596a00825d38fb4352d69e1cc4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 06:05:04 +0800
Tag:    v2.5.1

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

commit 5431fda1803b8f9e9e55c8a59faab11671d575d2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 06:04:12 +0800
Tag:    v2.6.0-beta

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

commit db728b8e5980416790b61056e38d19b1f6bdb701
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 06:01:24 +0800
Tag:    v2.3.8

Merge branch 'w23_MDL-39465_m23_environment' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 771b35c6fe78e43d23170d9a5acc336b11522361
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 06:01:16 +0800
Tag:    v2.4.5

Merge branch 'w23_MDL-39465_m24_environment' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 06ab9b88886cfb8671bb3460046b1b5ae71ca97b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 06:00:44 +0800
Tag:    v2.5.1

Merge branch 'w23_MDL-39465_m25_environment' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit a346c3826bb6211e7f31cb668dea77ca47ae05af
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 05:59:12 +0800
Tag:    v2.6.0-beta

Merge branch 'w23_MDL-39465_m26_environment' of git://github.com/skodak/moodle

commit b34fdf7d1ff6d057eb3e2828033bef48f0828e63
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 05:55:54 +0800
Tag:    v2.3.8

Merge branch 'MDL-39166-m23' of https://github.com/jfilip/moodle into MOODLE_23_STABLE

commit 613b32bbb85bcbeca43abe121e245e209870343e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 05:55:41 +0800
Tag:    v2.4.5

Merge branch 'MDL-39166-m24' of https://github.com/jfilip/moodle into MOODLE_24_STABLE

commit 0288c5ffe15217bf1758ef7e3c1c4ee1adcedfe1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 05:51:22 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39166-m25' of https://github.com/jfilip/moodle

commit 813db77aa23c383bd045db56ff7e8a266a2efeeb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 05:22:44 +0800
Tag:    v2.4.5

Merge branch 'wip-MDL-39710-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE

commit 73f8ab649f9f8a5d90e23c17464e7427116aea24
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 05:22:17 +0800
Tag:    v2.5.1

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

commit 9e3b5a47f63b877fd0517d15956eb81ea4a90063
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 05:18:55 +0800
Tag:    v2.6.0-beta

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

commit 83165bec0b6e9cf92336b120e2c026d40c81480e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 01:11:03 +0800
Tag:    v2.3.8

Merge branch 'MDL-39932_23' of git://github.com/grabs/moodle into MOODLE_23_STABLE

commit e4c30d9639d0d3a4d4560a60574fc064cfe4ad2d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 01:10:55 +0800
Tag:    v2.4.5

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

commit 189590bb37854c1d8593d699314cc8ac09912532
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 01:10:39 +0800
Tag:    v2.5.1

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

commit 71b2d24a9bb9e5de6086e88e545bf00b3aee2471
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 01:10:00 +0800
Tag:    v2.6.0-beta

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

commit 00e4ad0d1736f1757289299ffc4d9bf63f67a187
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 01:03:48 +0800
Tag:    v2.3.8

Merge branch 'MDL-39487_23' of https://github.com/IOC/moodle into MOODLE_23_STABLE

commit 954e3847838d37cd66ef47bb27d2603acbde893e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 01:03:38 +0800
Tag:    v2.4.5

Merge branch 'MDL-39487_24' of https://github.com/IOC/moodle into MOODLE_24_STABLE

commit 6cffc6664704068b46817aa0349de30e5e576a31
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 01:03:15 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39487_master' of https://github.com/IOC/moodle

commit c557f6b3247d15c2a814bcb5c41069f7766f7d9f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 03 Jun 2013 22:20:41 +0800
Tag:    v2.6.0-beta

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

commit 42a9e3efc2f0ef8e9d1a726e2d34e3e4ad597a68
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 03 Jun 2013 22:07:47 +0800
Tag:    v2.5.1

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

commit 847f1dd48994f270ef31eb4fa66a5dd5a215c452
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 May 2013 21:34:13 +0800
Tag:    v2.4.5

Merge branch 'w22_MDL-39676_m24_whereparam' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 4bc4844d5bf1f1885454bf7854ab935b0184daa9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 May 2013 21:33:33 +0800
Tag:    v2.5.1

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

commit aeb5f9ae37b142894dec6dfb9db0ad240f2a52fe
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 May 2013 21:31:07 +0800
Tag:    v2.6.0-beta

Merge branch 'w22_MDL-39676_m26_whereparam' of git://github.com/skodak/moodle

commit e58af1dfcdc2d88c0255c2554e924c674db9d0d6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 May 2013 07:24:58 +0800
Tag:    v2.5.1

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

commit 33b9fecd1942aacc9b727c77f24b56b51d488293
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 May 2013 07:23:27 +0800
Tag:    v2.6.0-beta

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

commit c8b05c3e8395ecd04557066863189814fa9c471e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 May 2013 07:02:49 +0800
Tag:    v2.4.5

Merge branch 'wip-MDL-39456-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit 4f0d6118ffc39f3eca143ef2c3665da2d8b40781
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 May 2013 07:02:34 +0800
Tag:    v2.5.1

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

commit f50ca7b3df09a87e4c848ece0ee5b68f7871088b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 May 2013 07:00:57 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-39456-m26' of git://github.com/samhemelryk/moodle

commit 8b77e812016cef3eb4846dbbe9558dbbeed4372e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 May 2013 06:57:06 +0800
Tag:    v2.5.1

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

commit ed602a597d43871bf338dadcb1df22b82a7e5633
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 May 2013 06:56:37 +0800
Tag:    v2.6.0-beta

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

commit d6e2b0a03e2142ac317fb6c871e43aa9d5aa6760
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 May 2013 06:45:02 +0800
Tag:    v2.5.1

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

commit cc4cbf67f0a8f69f0ab7c63240fd91272cee7414
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 May 2013 06:02:58 +0800
Tag:    v2.6.0-beta

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

commit 4a19404d65fe29d1c483a8f4e79de6655136f25e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 May 2013 22:00:33 +0800
Tag:    v2.3.8

Merge branch 'wip-MDL-39177-m23' of git://github.com/marinaglancy/moodle into MOODLE_23_STABLE

commit a3106cf3eb2bbaeb7a6d4c0e1837e10f18abfb93
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 May 2013 22:00:16 +0800
Tag:    v2.4.5

Merge branch 'wip-MDL-39177-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE

commit 89f6db3776cebd3d9a7a68d4d53032979b84c4ce
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 May 2013 21:50:56 +0800
Tag:    v2.6.0-beta

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

commit 65fc4c39a931e3c2f81f6f441c6871afadc8ba7c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 May 2013 08:22:55 +0800
Tag:    v2.6.0-beta

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

commit be06282e1b9303bd34f94be4b15ce9a6653e9ea8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 May 2013 08:19:40 +0800
Tag:    v2.4.5

Merge branch 'wip-MDL-39177-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE

commit f23331836d8c5509851f81b683f08174e2403bfb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 May 2013 08:13:27 +0800
Tag:    v2.3.8

Merge branch 'wip-MDL-39177-m23' of git://github.com/marinaglancy/moodle into MOODLE_23_STABLE

commit 5724b42c03bef0c17d33ced08b78cf305e80394b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 May 2013 08:28:34 +0800
Tag:    v2.3.8

Merge branch 'MDL-36482_23' of https://github.com/mr-russ/moodle into MOODLE_23_STABLE

commit ec01b3201dbbe085cffd10c8e9600be036157829
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 May 2013 08:28:20 +0800
Tag:    v2.4.5

Merge branch 'MDL-36482_24' of https://github.com/mr-russ/moodle into MOODLE_24_STABLE

commit a42467817b6aee27399c9b7302cd86f0eda6fdec
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 May 2013 08:25:41 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-36482_master' of https://github.com/mr-russ/moodle

commit ab6a0ac4f7fca18c7f82c76fcd6267e537f49757
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 May 2013 07:48:38 +0800
Tag:    v2.5.1

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

commit 40cdce2e780bb90cdf9a5d0b4f08c5405944333e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 May 2013 07:46:45 +0800
Tag:    v2.6.0-beta

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

commit 388b7d7d98bdac12310fc6cbd4443a44d09154a4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 May 2013 06:59:42 +0800
Tag:    v2.6.0-beta

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

commit 0a18bd17cc3de57913d69b413ff794597399ca2a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 May 2013 06:55:42 +0800
Tag:    v2.3.8

Merge branch 'MDL-26120_23' of https://github.com/jacks92/moodle into MOODLE_23_STABLE

commit 5efc195a326a8e6ace1526b4b48cb99abea8d7ce
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 May 2013 06:55:27 +0800
Tag:    v2.4.5

Merge branch 'MDL-26120_24' of https://github.com/jacks92/moodle into MOODLE_24_STABLE

commit 34e8106f5fa0c4cb92957c01c3d25a433f3729c8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 May 2013 06:54:08 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-26120' of https://github.com/jacks92/moodle

commit e3c1bd25935c5e748a5a29a9c6c3895e2bee4734
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 May 2013 06:44:22 +0800
Tag:    v2.5.1

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

commit 5e1a48df9748bb160f6033ed325a6d9cbdd2ce6f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 May 2013 06:44:05 +0800
Tag:    v2.6.0-beta

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

commit 1b0528adf026e6077623de530221410391dc683d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 May 2013 01:05:59 +0800
Tag:    v2.3.8

Merge branch 'MDL-31209-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE

commit f0697b7088b80dd44d9cde4afb1208d74ee52f67
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 May 2013 01:05:31 +0800
Tag:    v2.4.5

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

commit 98204580b3d93af744e3a93301ebd5ede484f4b1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 May 2013 01:05:14 +0800
Tag:    v2.6.0-beta

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

commit ff291e488d6c87d631db47dfa3e36a9c8f05a668
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 May 2013 17:18:14 +0800
Tag:    v2.5.0

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

commit 522b5faf606706e2788d1fdcff2a761ec62c715a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 13 May 2013 18:07:55 +0800
Tag:    v2.5.0

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

commit fd6e84c5be9158ec9c7d3e5d3873116378e3ddfb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 13 May 2013 17:54:01 +0800
Tag:    v2.4.4

Merge branch 'MDL-39642-en_fix-24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE

commit f26acbbf5b3465ea028c6962cbefffe648adb05d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 13 May 2013 17:53:25 +0800
Tag:    v2.3.7

Merge branch 'MDL-39642-en_fix-23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE

commit 1efd118e862d4c508303a28043b0f3125655e1a4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 23:18:36 +0800
Tag:    v2.2.10

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit 13a322f4b6c8fc8aeee8306b8577efe45176fe4b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 23:18:12 +0800
Tag:    v2.3.7

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

commit 82a69ceaa0097eeb595a34f83790aa228765b96f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 23:17:57 +0800
Tag:    v2.4.4

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

commit 3e81c83e68aca08478b3bf991c4904d1f2ae5f4b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 23:17:43 +0800
Tag:    v2.5.0-rc1

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

commit 2e97c22310d862d0c13d31b2cb76b54ca54508cf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 19:18:18 +0800
Tag:    v2.3.7

Merge branch 'MDL-39518-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

commit d6d685fd71842b0f69e3e504a78b7fa0e40e2fef
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 19:17:44 +0800
Tag:    v2.4.4

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

commit 6382f49fb19bba466c057fe5089e8762e8154c7c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 19:17:16 +0800
Tag:    v2.5.0-rc1

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

commit 9d5ec394537dd38a154858d831ce8cab85f5ad18
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 18:06:38 +0800
Tag:    v2.5.0-rc1

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

commit 86a8b476d4b105e329626c54043ba707c122d591
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 09:18:39 +0800
Tag:    v2.2.10

Merge branch 'MDL-38885-22-int' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit f6735ae534461693861cddc81ecdbab67e982359
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 09:17:55 +0800
Tag:    v2.3.7

Merge branch 'MDL-38885-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit eb2080240a853fed7f767cbd4353dd48056616c7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 09:17:19 +0800
Tag:    v2.4.4

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

commit da2cff35c508406fb058dcd8acb401e39073f325
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 09:16:09 +0800
Tag:    v2.5.0-rc1

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

commit 48265a65497ba3354960ee86021342ed31cdc84d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 08:54:33 +0800
Tag:    v2.3.7

Merge branch 'MDL-29758_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE

commit d5420db9343ef7fcc6ffd80b8b81eb9de57fc73b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 08:54:06 +0800
Tag:    v2.4.4

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

commit 05bf4b17e8b2e16338a101c8c0875678e440a791
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 08:53:49 +0800
Tag:    v2.5.0-rc1

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

commit 7942df199beb7dfc2106af042321a09c9d4504a5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 08:37:54 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38559-completion-ui' of git://github.com/mudrd8mz/moodle

commit ab0cb7cde6fd651ca634f2bda86d20c3a96dec78
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 08:36:30 +0800
Tag:    v2.5.0-rc1

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

commit 1065589db1a4c0dad35e51d3f0bb8ec819cda5ab
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 08:31:50 +0800
Tag:    v2.5.0-rc1

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

commit dd334c7a8b0950cf0d118ccfae08dee2e0a35308
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 07:42:19 +0800
Tag:    v2.5.0-rc1

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

commit b87572e860b3b1d2f9626da80561c22f6ecaf6b7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 04:18:58 +0800
Tag:    v2.5.0-rc1

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

commit 6185fa79e7d3730e09f29da70d58ee0ca3ac1d8b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 09 May 2013 21:49:33 +0800
Tag:    v2.3.7

Merge branch 'MDL-39488_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit 7f92387c85045b52287359589922d080f415b7a5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 09 May 2013 21:49:24 +0800
Tag:    v2.4.4

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

commit d560159df64c3861cf3951f40d652843a3dd79f1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 09 May 2013 21:47:38 +0800
Tag:    v2.5.0-rc1

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

commit 6d0e18efe8b0f3562bab533255ad8eda80feadf3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 09 May 2013 19:39:54 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39585-filters-upgrade' of git://github.com/mudrd8mz/moodle

commit 7f8cc6f777ff9dc351c07946b00186e95898da22
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 09 May 2013 06:55:28 +0800
Tag:    v2.3.7

Merge branch 'MDL-38487_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit ec00601863135b9936925946359e63bc7a630420
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 09 May 2013 06:54:54 +0800
Tag:    v2.4.4

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

commit 919a8db0a26da1b96b236bfef111712aaea5e1a6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 09 May 2013 06:35:28 +0800
Tag:    v2.5.0-rc1

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

commit 474e0d3cd20ae9a754f937ae3136fd4b5ed2ae3a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 09 May 2013 06:20:06 +0800
Tag:    v2.5.0-rc1

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

commit fc99ef7ebb75896720c3d170f69d8e9fb5dd5082
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 May 2013 16:30:25 +0800
Tag:    v2.5.0-rc1

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

commit 2fd46e12b8db398d55009f30e531e1609ad39165
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 May 2013 08:14:20 +0800
Tag:    v2.5.0-rc1

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

commit 4ce97aed0d48514781f0d16cc069b8a7b5e1a67f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 May 2013 06:28:15 +0800
Tag:    v2.5.0-rc1

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

commit b5e41dac94f07a09ae1f7fbe1de4ab63b547e371
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 May 2013 04:06:27 +0800
Tag:    v2.4.4

Merge branch 'MDL-39452-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE

commit d40a24384e5a1a5d238ce7a8f86c212444a940bc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 May 2013 04:06:04 +0800
Tag:    v2.5.0-rc1

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

commit fbd84c8eb5cd4e676d8562d2e68c59db1a49d90c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 May 2013 03:57:40 +0800
Tag:    v2.5.0-rc1

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

commit 5304ded836257af4e49f36a2ceca7dfeb26bc2c7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 May 2013 03:38:24 +0800
Tag:    v2.5.0-rc1

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

commit 52933ab0871fdc1a42e956c0378dd87e4f536acc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 May 2013 03:28:09 +0800
Tag:    v2.5.0-rc1

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

commit 3705a6dcbe14484146cb9814e7ef1abe8ec884f7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 May 2013 01:15:21 +0800
Tag:    v2.5.0-rc1

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

commit 1a77c6c263ca5288468f6024caefb0baf5eba90b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 May 2013 01:14:58 +0800
Tag:    v2.4.4

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

commit c6b1ff865fa8b8a5add05fd577b9694db0fe5ee0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 May 2013 01:14:19 +0800
Tag:    v2.3.7

Merge branch 'MDL-34275-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit 5b003e9cddc41c2a46969f5b610bc16220d39f79
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 07 May 2013 23:52:00 +0800
Tag:    v2.5.0-rc1

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

commit fc076898c79035be3c6a71f952ce4d3134808c21
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 07 May 2013 21:50:29 +0800
Tag:    v2.5.0-rc1

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

commit 4d71661e2bb7adbfcfea621980271ef66a408a17
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 07 May 2013 09:00:02 +0800
Tag:    v2.5.0-rc1

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

commit fc17f7568417b27002412ddc7341909da3f39bf9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 06 May 2013 22:50:30 +0800
Tag:    v2.5.0-rc1

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

commit 081bfdc5fff23b2c1eedcbfb35d49e1a7006d405
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 06 May 2013 07:49:51 +0800
Tag:    v2.5.0-rc1

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

commit 07c9a6db961b6c245feecdb43aa0e262150f4e86
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 06 May 2013 07:23:49 +0800
Tag:    v2.5.0-rc1

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

commit e7ff753cab0762232fceb4b3b2e67315c6e08a97
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 02 May 2013 09:33:35 +0800
Tag:    v2.5.0-rc1

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

commit 2f679b426ad6bcb10f04cf3d960256a124f90186
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 May 2013 22:55:36 +0800
Tag:    v2.5.0-rc1

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

commit eb244d3b87eae3b093fcb948978a12ea7c982871
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 May 2013 22:55:25 +0800
Tag:    v2.4.4

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

commit c738cc946f0b3caf3e26a10ec215713e669d54f7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 May 2013 22:54:06 +0800
Tag:    v2.3.7

Merge branch 'MDL-39444_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit bee592add8e856391972618e07c064ea5ac512d6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 May 2013 08:29:36 +0800
Tag:    v2.5.0-rc1

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

commit 48c8137388dff4156f7dadae34153df1ad0cd134
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 May 2013 07:35:24 +0800
Tag:    v2.3.7

Merge branch 'wip-MDL-39432-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE

commit d8d636dfe4323c2fdeb79891890ccf4cee4dff19
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 May 2013 07:35:10 +0800
Tag:    v2.4.4

Merge branch 'wip-MDL-39432-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit 6fc48952760ce3c5261687d3dd4ea37e5116c92d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 May 2013 07:33:18 +0800
Tag:    v2.5.0-rc1

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

commit 6a222aa127fc3cb10827cd1ce49f1b5f560d4a1a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 May 2013 06:47:32 +0800
Tag:    v2.5.0-rc1

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

commit a86103e09bb5f0439ab0f5cf468b829b246d05aa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 26 Apr 2013 17:10:09 +0800
Tag:    v2.5.0-rc1

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

commit e4a7816155ff3276a51ab65cfc4d9ea1e406df4a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 26 Apr 2013 16:48:38 +0800
Tag:    v2.5.0-rc1

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

commit 29b8b7e11ae10b2d389a9c3be911b9c0e4b6fa7d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 26 Apr 2013 05:50:08 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39358-standard-clean' of git://github.com/mudrd8mz/moodle

commit ff1e26aba4906f11f313c1c07885de79a7d38fd0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 25 Apr 2013 07:03:38 +0800
Tag:    v2.4.4

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

commit 4b9ae9e99767819fed1af00caa3be66424e29f37
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 25 Apr 2013 07:03:22 +0800
Tag:    v2.3.7

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

commit 344c04e0ffcb3662b848da7396617b862986639d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 25 Apr 2013 07:02:41 +0800
Tag:    v2.5.0-rc1

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

commit ac8b3d845eb853ca08ce90130dc5d2b72eaf3e68
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 25 Apr 2013 06:27:03 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39276_clean' of git://github.com/lazydaisy/moodle

commit 4017b1f76a9a7b4bd330b0825070ca4811aa47cf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 25 Apr 2013 06:00:23 +0800
Tag:    v2.5.0-rc1

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

commit cddf19fccd819ad9a6c8bd06e44b595a195c0f69
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 25 Apr 2013 05:37:17 +0800
Tag:    v2.3.7

Merge branch 'MDL-35364_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 9c65b19cb5d564c75289a23df7efc472b65274a0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 25 Apr 2013 05:36:55 +0800
Tag:    v2.4.4

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

commit 274511f0cbfe5c6748f14be26c126b3c5c7b754f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 25 Apr 2013 05:35:46 +0800
Tag:    v2.5.0-rc1

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

commit 01159be8de181c4ce7b6268709dcdb736ae67ab4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Apr 2013 08:02:20 +0800
Tag:    v2.5.0-rc1

Merge branch 'w16_MDL-38972_m25_oraindex' of git://github.com/skodak/moodle

commit bdeda339b45a0a54072484378f165f16541ee714
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Apr 2013 05:41:47 +0800
Tag:    v2.5.0-rc1

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

commit b279f334101f12d157504c948f60d9f452cb523a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Apr 2013 18:50:50 +0800
Tag:    v2.5.0-rc1

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

commit 9b81eef05d9b1d30df73dfa2a7e9aee58c1e5f39
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Apr 2013 08:43:49 +0800
Tag:    v2.5.0-rc1

Merge branch 'w15_MDL-39052_m25_csvtemp' of git://github.com/skodak/moodle

commit d10d607e8c7425b0260340c92194c35a969b6f33
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Apr 2013 08:01:16 +0800
Tag:    v2.5.0-rc1

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

commit a821c10b868fa5ed0bd26987716bfc6d4892722e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Apr 2013 07:55:45 +0800
Tag:    v2.5.0-rc1

Merge branch 'w15_MDL-39069_m25_helpwindow' of git://github.com/skodak/moodle

commit 4ec465b1555bb65dbe4a2e63b667762ef587a8d4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Apr 2013 07:40:51 +0800
Tag:    v2.5.0-rc1

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

commit e377d867651e3c3c43b1233ed22b747b14391166
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Apr 2013 07:36:43 +0800
Tag:    v2.5.0-rc1

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

commit 9004d7a51cfaca376f168dc95ecfd8c9ca27a9a0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Apr 2013 07:27:39 +0800
Tag:    v2.5.0-rc1

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

commit 91560510dc60ef4b5b1a678d7c6aec8aefbaf6f0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Apr 2013 07:06:17 +0800
Tag:    v2.5.0-rc1

Merge branch 'w15_MDL-39129_m25_afterburner' of git://github.com/skodak/moodle

commit 359c1d47566c08470578c432718e10b3baadd584
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Apr 2013 07:03:27 +0800
Tag:    v2.5.0-rc1

Merge branch 'w15_MDL-39075_m25_userdesc' of git://github.com/skodak/moodle

commit 3536896e2503c58ff5f005cf97365aa92a5cee07
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Apr 2013 05:50:19 +0800
Tag:    v2.5.0-rc1

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

commit e32a8ae83279d2ee8553ff717fd6ef9f16f252a9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Apr 2013 08:07:15 +0800
Tag:    v2.5.0-rc1

Merge branch 'w15_MDL-39132_m25_badgesettings' of git://github.com/skodak/moodle

commit 718995ee30041798b19a35b8b807263383a6f71a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Apr 2013 07:24:33 +0800
Tag:    v2.5.0-rc1

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

commit 1e803a3e45b12fe5ef46fddcf3dd74beeda71488
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Apr 2013 07:15:06 +0800
Tag:    v2.4.4

Merge branch 'm24_MDL-37844' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE

commit 4af6e51309bbf1b8c9273571966fb5437fed3ef6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Apr 2013 07:14:06 +0800
Tag:    v2.5.0-rc1

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

commit b4f93903a72c9e30ed0decab8cbe733b1218e9a2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 15 Apr 2013 08:33:17 +0800
Tag:    v2.5.0-rc1

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

commit 35bff0716d84c50cb1ade833bed56dfb281bdb7f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 15 Apr 2013 08:22:23 +0800
Tag:    v2.5.0-rc1

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

commit ef6fbe9eef97fbb1f34ca636c9a86d73c46280be
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 15 Apr 2013 08:22:06 +0800
Tag:    v2.5.0-rc1

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

commit e9324d0863db5043a03d0213b6e5e787c075d0ac
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 15 Apr 2013 08:19:58 +0800
Tag:    v2.5.0-rc1

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

commit 252612a6700a7d489c75c277b3ea23fb1c0e2414
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 15 Apr 2013 08:08:35 +0800
Tag:    v2.5.0-rc1

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

commit 068fc30fa57af3771d8f71630634ae450e00ee99
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 15 Apr 2013 07:59:21 +0800
Tag:    v2.5.0-rc1

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

commit c7ed9140770c5c128eaad5850796f379e51208d3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 15 Apr 2013 07:58:01 +0800
Tag:    v2.3.7

Merge branch 'MDL-39089_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE

commit 6e0b5a725dcb08f7b00ad5cad175354e7c0e31a4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 15 Apr 2013 07:57:35 +0800
Tag:    v2.4.4

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

commit 7fc82aec495ff4a23d9aba5d323fbb13ef713186
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 15 Apr 2013 07:57:01 +0800
Tag:    v2.5.0-rc1

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

commit 2f587fb334f178161200971239d132d2ca663ede
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Apr 2013 22:44:47 +0800
Tag:    v2.5.0-rc1

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

commit 2087fa6223332b0b6602ab348f8eb95c0f6629f0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Apr 2013 22:32:32 +0800
Tag:    v2.5.0-rc1

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

commit bd3d4c9e8d60dd2667f66924b370f913ae152686
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Apr 2013 22:30:08 +0800
Tag:    v2.5.0-rc1

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

commit 33fcbe89d4eef4f409f3f2359be2c591d457aa16
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Apr 2013 22:11:40 +0800
Tag:    v2.5.0-rc1

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

commit c51e1fa37e9a388740f0fc8757e7d13a30b62b56
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Apr 2013 21:56:45 +0800
Tag:    v2.5.0-rc1

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

commit e9bcf8019b1f647208dc6002ff7c9e3d68efe4ca
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Apr 2013 21:52:53 +0800
Tag:    v2.5.0-rc1

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

commit fe58009eda8eefa6208681143d504dde8489f14e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Apr 2013 18:33:20 +0800
Tag:    v2.2.10

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit 2a564dc2bffdaccafe11123302c52c62382f6c96
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Apr 2013 18:33:06 +0800
Tag:    v2.3.7

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

commit 112c8e8812493995b9a3c9a25769bab94c826da4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Apr 2013 18:32:51 +0800
Tag:    v2.4.4

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

commit f6cec2fd62f56626198d5616eb0ef819d0eeeeb5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Apr 2013 18:32:32 +0800
Tag:    v2.5.0-rc1

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

commit f3d49933b035010cbc5348271a8aa5544701c763
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Apr 2013 06:57:23 +0800
Tag:    v2.3.7

Merge branch 'MDL-38525-23' of https://github.com/damyon/moodle into MOODLE_23_STABLE

commit 0d9a2ce8e0d8e48f43813d13d546730d3cfcdcc0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Apr 2013 06:57:07 +0800
Tag:    v2.4.4

Merge branch 'MDL-38525-24' of https://github.com/damyon/moodle into MOODLE_24_STABLE

commit e592ccd860cb72804e1fc5b413d86751a35c96db
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Apr 2013 06:56:45 +0800
Tag:    v2.5.0-rc1

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

commit 2e140437b14a44921bb1c1184d8ac3c7ea9c8a64
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Apr 2013 06:43:59 +0800
Tag:    v2.5.0-rc1

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

commit 2cef0f7c333e007109d9a97a8e54bd1da24c8ecd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Apr 2013 06:32:40 +0800
Tag:    v2.5.0-rc1

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

commit a7ed1eca089df32073643d8a7feb67d11ba54824
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Apr 2013 06:22:42 +0800
Tag:    v2.5.0-rc1

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

commit b812305ef65416b5b9b3302e20b764c7aa080715
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Apr 2013 21:45:16 +0800
Tag:    v2.5.0-rc1

Merge branch 'w15_MDL-38989_m25_ttfinal' of git://github.com/skodak/moodle

commit e6c7a5887b85f2df0ef19ab2d573de542954258e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Apr 2013 05:43:46 +0800
Tag:    v2.5.0-rc1

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

commit 36216331942b0a075746284bead2f39b50e4c27d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Apr 2013 05:42:59 +0800
Tag:    v2.5.0-rc1

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

commit 8516f270c612aa3f9cb653a9f0230fac8954878f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Apr 2013 05:30:43 +0800
Tag:    v2.5.0-rc1

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

commit 696facb159bc463c62e3a4a9cc5f4a431ffbafe1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Apr 2013 05:30:30 +0800
Tag:    v2.5.0-rc1

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

commit b8968449428c02d0e5b48c175efde72b030f4976
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Apr 2013 05:29:59 +0800
Tag:    v2.5.0-rc1

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

commit 5bd80500f2125137cbb33b95fdbd073ee60bc7e1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Apr 2013 05:13:44 +0800
Tag:    v2.5.0-rc1

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

commit d2f77303b0c5e2d6250cbb57005a663c3820bcb4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Apr 2013 05:13:32 +0800
Tag:    v2.5.0-rc1

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

commit a9aa326ea9e22ea8f9bb117b2decd64186769599
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Apr 2013 05:13:21 +0800
Tag:    v2.5.0-rc1

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

commit 6bb78aedee65dd8467be140b308ec57bf0310d2b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Apr 2013 02:24:17 +0800
Tag:    v2.5.0-rc1

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

commit d06700cbd6fdbaad3b3b90c1de1ace6a4b497243
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Apr 2013 02:23:38 +0800
Tag:    v2.5.0-rc1

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

commit f7f8ca2420e1de284674ea1fd73c605df3113d1b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Apr 2013 02:22:59 +0800
Tag:    v2.5.0-rc1

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

commit a2027b873b75a16ae04b07ca35c16050e715dbfa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Apr 2013 02:00:34 +0800
Tag:    v2.5.0-rc1

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

commit c1fc4ba397c38fa0941cb4b2cc04c9d35bc59227
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Apr 2013 01:59:45 +0800
Tag:    v2.5.0-rc1

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

commit 26b7bea2c05ad452275c49c602b843442f3862e4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Apr 2013 01:55:29 +0800
Tag:    v2.5.0-rc1

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

commit 275c2c9f8a3abea85e17bc8f1a2900b557ab4ddf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Apr 2013 01:40:39 +0800
Tag:    v2.5.0-rc1

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

commit 441b165c12ac1b45849100b5ff41c4ee14e8240e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 23:36:57 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39056-download-api-version' of git://github.com/mudrd8mz/moodle

commit f57832826bab6674f4a55cda818014b8bf7015c5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 20:33:31 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38792' of https://github.com/ppichet/moodle

commit dba85495c11f0a2c2b6033a535b4fa9db0e2f556
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 08:47:51 +0800
Tag:    v2.5.0-rc1

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

commit 552f00fb8621c077457b2cada154e1a0db6402c5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 08:26:49 +0800
Tag:    v2.5.0-rc1

Merge branch 'w14_MDL-38750_m25_ocierrors' of git://github.com/skodak/moodle

commit 679620265af7d2ace4ad167c06cb3eed8ec745b3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 08:25:54 +0800
Tag:    v2.3.7

Merge branch 'w14_MDL-38753_m23_ocicount' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 989a8abc442e8e9e55e896ac2225dce97e9a2826
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 08:25:31 +0800
Tag:    v2.4.4

Merge branch 'w14_MDL-38753_m24_ocicount' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit e934648d075b80b52c49c0a36fa991541a5a88a9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 08:25:12 +0800
Tag:    v2.5.0-rc1

Merge branch 'w14_MDL-38753_m25_ocicount' of git://github.com/skodak/moodle

commit 13af1f0497ef285fbc6ee9bf9d7abcfdf8e24081
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 08:23:36 +0800
Tag:    v2.5.0-rc1

Merge branch 'w14_MDL-39038_m25_oracleconcat' of git://github.com/skodak/moodle

commit cf42eece55bdf107a2c2a3cc2333d86c879d5cad
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 08:19:41 +0800
Tag:    v2.5.0-rc1

Merge branch 'w14_MDL-39027_m25_sqlsrvdatatype' of git://github.com/skodak/moodle

commit 6afbf283defe6574c23cd49259b88220c08ed83f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 08:17:56 +0800
Tag:    v2.5.0-rc1

Merge branch 'w14_MDL-39028_m25_sqlsrconcat' of git://github.com/skodak/moodle

commit 187afd0f528b79bf53fbb437bf0408d9d1b7cdde
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 08:01:04 +0800
Tag:    v2.5.0-rc1

Merge branch 'w14_MDL-39019_m25_mssqldatatype' of git://github.com/skodak/moodle

commit a035bc9b6d1c5f79bdb74aa8ccc633a5f31fa9ba
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 07:58:20 +0800
Tag:    v2.5.0-rc1

Merge branch 'w14_MDL-39024_m25_mssqlseek' of git://github.com/skodak/moodle

commit ce2cd4490839e00502e545cf4004dca4789cf786
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 07:53:57 +0800
Tag:    v2.5.0-rc1

Merge branch 'w14_MDL-39022_m25_mssqlconcat' of git://github.com/skodak/moodle

commit 60f9cae763958b543a3cb9c3f3836a0692828606
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 07:44:58 +0800
Tag:    v2.5.0-rc1

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

commit f3da6ac7aaf532d82b05d351dcc33f60c4fde5a0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 07:40:06 +0800
Tag:    v2.3.7

Merge branch 'MDL-38912_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit f6a2e02702ecbfac75c8ae5dd59ab8b81c98295b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 07:39:49 +0800
Tag:    v2.4.4

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

commit 70273fb6ae84ca8d5f294e601f718f8ba52fefeb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 07:36:20 +0800
Tag:    v2.5.0-rc1

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

commit 196bd8c88525e0ef658ee5c64b09d415a573be75
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 07:32:35 +0800
Tag:    v2.5.0-rc1

Merge branch 'w14_MDL-38786_m25_yui391' of git://github.com/skodak/moodle

commit de0fc867adbb880c18c232b119a1a33706681d6a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 07:24:08 +0800
Tag:    v2.5.0-rc1

Merge branch 'w14_MDL-34222_m25_simplepie131' of git://github.com/skodak/moodle

commit b19e8a1fb9398e16e2661a5253e79c00f6091047
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 07:13:57 +0800
Tag:    v2.5.0-rc1

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

commit d29afc45779e5bb7b118d8008cad2d746940f984
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 06:58:02 +0800
Tag:    v2.5.0-rc1

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

commit 5df002ad6874487075f440af843aca9604b0d16f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 06:52:27 +0800
Tag:    v2.5.0-rc1

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

commit 1b9d0b9e3ec57c8c1b6851258f9588951a0e6629
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 08 Apr 2013 22:58:03 +0800
Tag:    v2.3.7

Merge branch 'MDL-39023-parentlang_23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE

commit a38756913440d221ec3fe898f09fef47e9ea544c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 08 Apr 2013 22:57:47 +0800
Tag:    v2.4.4

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

commit 5a0443cc14d75dd71270d9d013c96f7166e0910d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 08 Apr 2013 22:57:38 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39023-parentlang' of git://github.com/mudrd8mz/moodle

commit 577173a51ff03367f137b990eed0a4958ad1020f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 05 Apr 2013 09:21:52 +0800
Tag:    v2.5.0-beta

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

commit c5f4080a1051a54bf1418ff4a6c63582d31441be
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 05 Apr 2013 08:51:48 +0800
Tag:    v2.5.0-beta

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

commit dbc5692fc5a748c0f214773c8efc72b246eebc8f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 05 Apr 2013 08:48:37 +0800
Tag:    v2.5.0-beta

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

commit 8f3885f23d051632ef12b8b7fbe79aa3f095e582
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 05 Apr 2013 08:46:15 +0800
Tag:    v2.5.0-beta

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

commit c001c51a2634b0334d2d392437ab48a827f2bd49
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 04 Apr 2013 22:59:34 +0800
Tag:    v2.5.0-beta

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

commit 0c7ad0ab13cba0be855f201a481862c3eccde13c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 04 Apr 2013 07:15:34 +0800
Tag:    v2.5.0-beta

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

commit 1b882ab87b8df8550275d2b80ceb8c205c75fdc8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 04 Apr 2013 07:14:36 +0800
Tag:    v2.5.0-beta

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

commit 33871fbf3efcfca4a1fc7c17a359bd4a3b962797
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 04 Apr 2013 07:07:23 +0800
Tag:    v2.5.0-beta

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

commit 5c98b64b00f0cbe6e017c9c7d88e7ec1d12d3ddf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 04 Apr 2013 07:04:00 +0800
Tag:    v2.5.0-beta

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

commit 235fc2562cbcd7aa76b6328f48d56eb59e0fb227
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 04 Apr 2013 07:02:20 +0800
Tag:    v2.5.0-beta

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

commit a88b558c834e96ec654134897563d2716706573d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 04 Apr 2013 06:58:39 +0800
Tag:    v2.3.7

Merge branch 'MDL-38112-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit 3a5cb521c93baa0e29f30c2478a481830f18c8ce
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 04 Apr 2013 06:57:59 +0800
Tag:    v2.4.4

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

commit a37a6984174b1727396147abf5795773630a2b7e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 04 Apr 2013 06:53:05 +0800
Tag:    v2.5.0-beta

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

commit 75fb3832604a33974afb0c77dab865ff71ede99b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 04 Apr 2013 06:51:47 +0800
Tag:    v2.5.0-beta

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

commit 68a6d3cd9ffbf945d2d0fba542ea55c7b8e7109f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 04 Apr 2013 06:34:24 +0800
Tag:    v2.5.0-beta

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

commit 76d86181a36095aebe98884338961674f8f7505c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 04 Apr 2013 05:45:40 +0800
Tag:    v2.5.0-beta

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

commit 1ca5ce1b33f0cc822aa38ebd9867cf08367827c7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 04 Apr 2013 05:09:19 +0800
Tag:    v2.5.0-beta

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

commit 896efbeadb33b37dd0d971eb0b82a437eac86b1b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 04 Apr 2013 03:59:18 +0800
Tag:    v2.5.0-beta

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

commit 0e864c3f213e06e374307a4ce276658c490728f0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 04 Apr 2013 02:06:49 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38733-workshop-rubric-css' of git://github.com/mudrd8mz/moodle

commit 2a5e0d6321a8f4c5b9363d4410f3369126dc92a2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 04 Apr 2013 01:48:02 +0800
Tag:    v2.5.0-beta

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

commit 7191a59fc9d5e8f66511648edc501bbd60a68f8a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Apr 2013 23:12:04 +0800
Tag:    v2.5.0-beta

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

commit 6b117438b92febcd107e26f24417482b1ff9cbbb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Apr 2013 22:48:42 +0800
Tag:    v2.5.0-beta

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

commit 57902e2738a917778ed7a17a6030675c46a5b202
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Apr 2013 19:33:16 +0800
Tag:    v2.5.0-beta

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

commit c9f8620492ebc0c823f52291c079cd57803a83ae
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Apr 2013 19:20:23 +0800
Tag:    v2.5.0-beta

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

commit 636376947c04ef154fe29a616f45d3a33799cfeb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Apr 2013 09:17:08 +0800
Tag:    v2.5.0-beta

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

commit a2f667472e18d3e8da5f4a89b58abf24dd0cb4be
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Apr 2013 03:06:21 +0800
Tag:    v2.5.0-beta

Merge branch 'm25_MDL-38790_Missing_setType_in_My_private_files_form' of https://github.com/scara/moodle

commit 991dcb1b820bfd6135962a7d14ae8e74ca7b9637
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Apr 2013 03:01:52 +0800
Tag:    v2.5.0-beta

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

commit d3f422bdc177df001afc490338a89c117093a602
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Apr 2013 02:46:05 +0800
Tag:    v2.5.0-beta

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

commit 80430739d912c30e56777f4965278a2e01630ba3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Apr 2013 02:41:00 +0800
Tag:    v2.5.0-beta

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

commit a534e06e473893a99d730c38859dcac144adb135
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Apr 2013 00:35:41 +0800
Tag:    v2.5.0-beta

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

commit 871da25a40a0bb4e6dcee6f84c2d5c54ca9b64bc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 21:51:17 +0800
Tag:    v2.5.0-beta

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

commit 7fb5b7fae180c1f9d8a7043c6da16c8b672a7e3c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 21:25:19 +0800
Tag:    v2.5.0-beta

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

commit a5efbe6161b219f6b832a1f8e2df3745ecfb7845
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 09:30:30 +0800
Tag:    v2.5.0-beta

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

commit 51cae5899874cd500ff84a908c322e96668b3508
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 08:41:44 +0800
Tag:    v2.5.0-beta

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

commit d6dc3019b62a6f78a5f6c7465fdb2a7595b6ff39
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 08:41:33 +0800
Tag:    v2.5.0-beta

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

commit 1c49f7ad1986db9b96464bdbb221021a1f2fe910
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 08:41:25 +0800
Tag:    v2.5.0-beta

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

commit 342c3f3e6c73f4aabdae61bd8a38a23784149485
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 08:27:10 +0800
Tag:    v2.5.0-beta

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

commit 3e275484317a0a360b7ef9e81e330c06444ff77f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 08:26:54 +0800
Tag:    v2.5.0-beta

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

commit 12879418e98121d91ea5e9b77349d066e25f67ed
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 07:47:40 +0800
Tag:    v2.5.0-beta

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

commit 23726a43d48ff6657b6ecf53ffb8c8ff186751bb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 07:45:43 +0800
Tag:    v2.5.0-beta

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

commit cd4c7e9af40e2931c8b362ff4017bb9781d67964
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 07:44:59 +0800
Tag:    v2.5.0-beta

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

commit 0f8fd3a7eb5d918e477b07381173a01208a2794a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 07:06:18 +0800
Tag:    v2.5.0-beta

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

commit 2bb24f16e097a16a489a8a24877916c742f76b11
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 07:06:05 +0800
Tag:    v2.5.0-beta

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

commit 55a2081d2832193cc9db54a61f83321a402465bf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 07:04:44 +0800
Tag:    v2.5.0-beta

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

commit c1bccc8ef53839f1611076aee7dcfec58e28399f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 07:04:31 +0800
Tag:    v2.5.0-beta

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

commit 9f0700fb6caae3b72a6b98a3de24d674beb0d1ad
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 07:03:26 +0800
Tag:    v2.5.0-beta

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

commit 54e48dc32d8c5dd1ebfe78fc5d4200202ed9fc0d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 04:32:06 +0800
Tag:    v2.5.0-beta

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

commit c57c57c575ef77061426595c9c1699e3991e1eed
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 04:23:58 +0800
Tag:    v2.5.0-beta

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

commit 0251a625004e77e319331fbcee64459f1fad7cb2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 04:17:12 +0800
Tag:    v2.5.0-beta

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

commit d4a5896f8a21ddf7717bf99321fd0128b862046c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 01 Apr 2013 19:25:31 +0800
Tag:    v2.5.0-beta

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

commit 68adfee6d453603f0e08b1fabeeba5f69df8a434
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 01 Apr 2013 19:17:20 +0800
Tag:    v2.5.0-beta

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

commit b216376811557c3561e2a3aabde6e3922994a49f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 01 Apr 2013 19:12:08 +0800
Tag:    v2.5.0-beta

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

commit 50206449b62680db4688dc11ed05962f7bb40b55
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 28 Mar 2013 06:56:57 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38516-m' of https://github.com/andrewnicols/moodle

commit 113f9a68bdfa7b8f9b8f8104615688b0fac49409
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 28 Mar 2013 06:38:33 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38520-m' of https://github.com/andrewnicols/moodle

commit 9b79c017f92b7462a45c87c4e4471d4e5527bbda
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 28 Mar 2013 06:20:18 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38473-m' of https://github.com/andrewnicols/moodle

commit 59549129b1d8fb0876afa4843f5f012428aec89c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 28 Mar 2013 06:06:46 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38404-m' of https://github.com/andrewnicols/moodle

commit f3804a0c00f46bf330be50fb02531f9c15a268b2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 28 Mar 2013 05:42:33 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38472-m' of https://github.com/andrewnicols/moodle

commit cb39c6136b862857c8e2310d827355985048379f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 28 Mar 2013 05:29:21 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38519-m' of https://github.com/andrewnicols/moodle

commit c4b39661b9f704b44fdcc166d9018a44f8352133
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 28 Mar 2013 04:43:30 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38517-m' of https://github.com/andrewnicols/moodle

commit a8cdbbe053740ce0f75a8b37a67ea491be67f176
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 28 Mar 2013 01:50:34 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38471-m' of https://github.com/andrewnicols/moodle

commit 3b597dd4ee91e42d14b56d5d3f5955445e9f6d2a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Mar 2013 09:00:02 +0800
Tag:    v2.5.0-beta

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

commit 49ef0c56efc1996e8971f9b806f6e69fdebf5774
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Mar 2013 08:51:35 +0800
Tag:    v2.5.0-beta

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

commit 381ffd46fc89c724828d4721298be465f0b47d9d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Mar 2013 08:49:10 +0800
Tag:    v2.5.0-beta

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

commit 18ceea60afa4c4c8d5a30c4852aa121db36f905c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Mar 2013 07:47:32 +0800
Tag:    v2.5.0-beta

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

commit 2477bb29cc102b51c5b656472f2f6b0f14a5e16d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Mar 2013 07:46:05 +0800
Tag:    v2.5.0-beta

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

commit 64a807ae44d9da315eed9fd1b0061bcd30d616df
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Mar 2013 07:43:19 +0800
Tag:    v2.5.0-beta

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

commit 4984697c122150d2c78ef0c4b171381ca0827e17
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Mar 2013 06:42:11 +0800
Tag:    v2.3.7

Merge branch 'MDL-38557_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 821c60617e210f474f528978baa99f65f9f80fb9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Mar 2013 06:41:31 +0800
Tag:    v2.4.4

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

commit cf140de9459a3f98496129aab331f6f06e0aa456
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Mar 2013 06:38:07 +0800
Tag:    v2.5.0-beta

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

commit b741fac30841606cfbf057b6710898d1f03b1a11
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Mar 2013 06:27:16 +0800
Tag:    v2.5.0-beta

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

commit e721f2dec8187ae83676b874b7feca5ed2b9e287
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Mar 2013 06:24:00 +0800
Tag:    v2.3.7

Merge branch 'MDL-38647_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 673ff9d82edd925d9f20081969bfe5c350878709
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Mar 2013 06:22:53 +0800
Tag:    v2.4.4

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

commit d89eed6fcac2b35b96b28249326ca0d73fe46b24
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Mar 2013 06:22:25 +0800
Tag:    v2.5.0-beta

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

commit 45679e3a9ec067a4a345a2301650aa986ceecdfe
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Mar 2013 06:14:24 +0800
Tag:    v2.5.0-beta

Merge branch 'w13_MDL-38589_m25_pear' of git://github.com/skodak/moodle

commit e01812b33337f59f4335fd351edb6f4b69bc4ba0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Mar 2013 06:13:33 +0800
Tag:    v2.5.0-beta

Merge branch 'w13_MDL-37783_m12_testinfo' of git://github.com/skodak/moodle

commit 8ef5dc58ea562e089c376f387b7ac5e8883f26ba
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Mar 2013 06:10:11 +0800
Tag:    v2.5.0-beta

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

commit 4efcfaa3aec5d7ff6398b1e69278b5a48cbf1904
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Mar 2013 06:04:48 +0800
Tag:    v2.5.0-beta

Merge branch 'w13_MDL-37742_m25_dirtyoracle' of git://github.com/skodak/moodle

commit 2ac738f8ede52de7b642b13eff01ea5f328a0854
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Mar 2013 23:09:06 +0800
Tag:    v2.5.0-beta

Merge branch 'w13_MDL-37782_m25_testtrans' of git://github.com/skodak/moodle

commit 0d377c8d565946c11b62ea322f1315104b53f586
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Mar 2013 23:07:12 +0800
Tag:    v2.5.0-beta

Merge branch 'w13_MDL-38671_m25_adodb' of git://github.com/skodak/moodle

commit cf20e809aabc4a9e6781a4a6a39ef418b32fca65
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Mar 2013 23:03:37 +0800
Tag:    v2.5.0-beta

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

commit 38495379a8defc3e596c00109cbf96c00480d2da
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Mar 2013 20:37:13 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38719'

commit 864a5cfd2f102da0bda4aaa12ec94e6e74932f1f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 25 Mar 2013 06:40:55 +0800
Tag:    v2.4.4

Merge branch 'MDL-38658-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE

commit 5214f9ef96844332c7f58b62a4045762a2426d16
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 25 Mar 2013 06:40:50 +0800
Tag:    v2.5.0-beta

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

commit eea80d257c1ea379fd9f9e5addc2f7ed16d8921f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 25 Mar 2013 06:39:42 +0800
Tag:    v2.3.7

Merge branch 'MDL-36927-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit d2db86448e5f2dbdc41a9bb8c4660e4ee302096a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 25 Mar 2013 06:39:22 +0800
Tag:    v2.4.4

Merge branch 'MDL-36927-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE

commit 943e317cb40c4cf40422fabdcc454305404c277a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 25 Mar 2013 06:39:07 +0800
Tag:    v2.5.0-beta

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

commit 22ddcdef89fec4d779724e12b6b9e51b2224798f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 25 Mar 2013 06:26:55 +0800
Tag:    v2.5.0-beta

Merge branch 'w13_MDL-38581_m25_forumtests' of git://github.com/skodak/moodle

commit 3ea063fe7de581b99f46ec7e9de9d8206fdbdf9e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 21 Mar 2013 17:56:31 +0800
Tag:    v2.3.7

Merge branch 'MDL-37664-23-int' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 6ef445a515521f6ecf3f2a249c65a592d5f17c9c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 21 Mar 2013 00:09:22 +0800
Tag:    v2.4.4

Merge branch 'MDL-38035-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE

commit fedcc830162adfd28a8a0146bf3070b9e6a6b012
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 21 Mar 2013 00:06:22 +0800
Tag:    v2.5.0-beta

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

commit cfe6a96f0ad2ff6e7c08eb4c7b1f738eac15c773
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 08:47:52 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38470-m' of https://github.com/andrewnicols/moodle

commit 99b3e4e7bdb39eae6a3812cd9dc89f463fa78310
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 08:21:05 +0800
Tag:    v2.5.0-beta

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

commit dc1abf2bc4f4510ba19359048325eff5061a5495
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 08:19:17 +0800
Tag:    v2.5.0-beta

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

commit e8151631620bebb92f44099fc5f4649fc9c70bd3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 07:43:49 +0800
Tag:    v2.3.7

Merge branch 'MDL-38490_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 8bcca79594b2b9b24ca423ae77775441565af5f3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 07:43:43 +0800
Tag:    v2.4.4

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

commit 8b994ec0b9d6480d39483363c8ff7ba683e37f14
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 07:43:09 +0800
Tag:    v2.5.0-beta

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

commit e233dc58ed4907eb372fe24d05cf3f4fee3d4eb5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 07:34:52 +0800
Tag:    v2.5.0-beta

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

commit 665f13c50c5e5ce5244849ea8d975ca3201a6e95
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 07:32:09 +0800
Tag:    v2.3.7

Merge branch 'MDL-38370-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit e285f93242e1338454edb0d15d3a39f9c95d4607
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 07:32:02 +0800
Tag:    v2.4.4

Merge branch 'MDL-38370-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE

commit b35dd05521b641be1174f29dbb03a127184ddf7c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 07:30:49 +0800
Tag:    v2.5.0-beta

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

commit 601054daca081f1bd01f696379419063e3bcea68
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 07:21:58 +0800
Tag:    v2.3.7

Merge branch 'w12_MDL-38364_m23_phpunitloading' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit d4aac84fbecad9392ed7ed72722dfe9115bb70a6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 07:19:57 +0800
Tag:    v2.4.4

Merge branch 'w12_MDL-38364_m24_phpunitloading' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 6a32219c84d36d1869af22e4dc9995a0d323bd04
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 07:17:35 +0800
Tag:    v2.5.0-beta

Merge branch 'w12_MDL-38364_m25_phpunitloading' of git://github.com/skodak/moodle

commit 044566f0016dd3984da270cb0ae178886cdea9ac
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 07:13:51 +0800
Tag:    v2.5.0-beta

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

commit 87342f4cfb97893df981d083acd5e05350b14397
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 06:57:51 +0800
Tag:    v2.4.4

Merge branch 'MDL-38035-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE

commit 1d962a1984ca1913b3a2197f8d23219ce13c6604
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 06:54:27 +0800
Tag:    v2.5.0-beta

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

commit a3a6b68ae95aa231dae6ceba45a511e528982824
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 06:37:49 +0800
Tag:    v2.3.7

Merge branch 'MDL-37664-MOODLE_23_STABLE' of https://github.com/lucisgit/moodle into MOODLE_23_STABLE

commit e4095955edf27cbddd9594230511a430161acc9a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 06:37:31 +0800
Tag:    v2.4.4

Merge branch 'MDL-37664-MOODLE_24_STABLE' of https://github.com/lucisgit/moodle into MOODLE_24_STABLE

commit 354ec0691b4b0b98bd8b42aad6dce552a2774c42
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 06:31:21 +0800
Tag:    v2.5.0-beta

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

commit e73ac7692eaae562ac4f67e53493196293b0c9cb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 06:27:50 +0800
Tag:    v2.5.0-beta

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

commit 1d790031c2bd10ecd24696c96262a70867d1cd49
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 06:26:01 +0800
Tag:    v2.5.0-beta

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

commit eb8a3eeaac00a2b7fe8041fad55b7e482968eb76
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 06:20:31 +0800
Tag:    v2.5.0-beta

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

commit c2879b7db8f57ad2e7b46cac644673f19ea4c300
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 06:18:59 +0800
Tag:    v2.3.7

Merge branch 'MDL-38424_m23' of git://github.com/kordan/moodle into MOODLE_23_STABLE

commit 5efd762f7afead2377b736b72abda883404b335f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 06:18:51 +0800
Tag:    v2.4.4

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

commit ec05fb8367144fe015caa5fd3c3ecc441dbd8086
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 06:17:39 +0800
Tag:    v2.5.0-beta

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

commit 85620106df50345f303ef2ab82e6493b154cd56c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 06:15:04 +0800
Tag:    v2.5.0-beta

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

commit 9146ab295da1fc3c1ec004f028a93a49d2ea1800
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 06:13:16 +0800
Tag:    v2.3.7

Merge branch 'MDL-38395_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 581e9db8e056f5d6f656477dc3dc5b73999d1795
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 06:07:24 +0800
Tag:    v2.4.4

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

commit 65b5f400b861fb42adf35eadcfb68b184ec23386
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 06:06:06 +0800
Tag:    v2.5.0-beta

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

commit 14742ceb73ff8603b8cc4cff1e7fcec48c656cc7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 04:17:19 +0800
Tag:    v2.3.7

Merge branch 'MDL-38460_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit 745a0dc66019d68172568230e18231d7ccad7c4b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 04:14:55 +0800
Tag:    v2.4.4

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

commit 7a4605ae62c82958687cec1239036e9915a8cf47
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 04:13:22 +0800
Tag:    v2.3.7

Merge branch 'wip-MDL-38422_M23' of git://github.com/gjb2048/moodle into MOODLE_23_STABLE

commit dc122b32b3338cec0ff843533797488ffa908a44
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 04:12:53 +0800
Tag:    v2.4.4

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

commit e250e9ae299c0a665309ca94b0216112c69363cb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 04:07:29 +0800
Tag:    v2.3.7

Merge branch 'MDL-38363_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 82f27d5bbd441e6b9b5d2ec7d13833eb2d4b4a8e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 04:07:08 +0800
Tag:    v2.4.4

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

commit 989b9ab6fb2228d76c6d56548cf51eb5f31874e8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 04:02:48 +0800
Tag:    v2.5.0-beta

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

commit a0b12848a47fec2cc958993dae726213d8d0b717
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 04:01:24 +0800
Tag:    v2.3.7

Merge branch 'MDL-38355_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit bc353318b28c6b631fbc0a669c584dc53cf17aa7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 04:01:10 +0800
Tag:    v2.4.4

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

commit 28a5cd942daebe9f3266ec8f10252ff24764284b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 04:00:21 +0800
Tag:    v2.5.0-beta

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

commit e0e59a0c380ca41fa264760a88a12048db65e307
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 02:15:09 +0800
Tag:    v2.5.0-beta

Merge branch 'w12_MDL-38558_m25_preupgrade' of git://github.com/skodak/moodle

commit 07c65a602992e8d607339e168b5c1f2b30b3d96b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 02:03:37 +0800
Tag:    v2.3.7

Merge branch 'MDL-38388_23' of git://github.com/jonof/moodle into MOODLE_23_STABLE

commit 4b6963eb6dd308b837b334d75990f6be4b07b4f1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 02:03:21 +0800
Tag:    v2.4.4

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

commit 49ac0c5d6a503fd7c6c1f916517c038f0bf29e08
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 01:47:39 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38388' of git://github.com/jonof/moodle

commit bab8a6724f0df24ab5ec4bd11583e459d94fbe2e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 01:27:57 +0800
Tag:    v2.5.0-beta

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

commit 7849c443762e6c2a62abdfdfe969d4ef4276f9ed
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 01:23:04 +0800
Tag:    v2.3.7

Merge branch 'MDL-38412_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 60d7878a3a9587906723b66efff79605b81b5b4a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 01:22:53 +0800
Tag:    v2.4.4

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

commit bf2d2aa983054e7c4869204094a56280d25e58b9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 01:20:47 +0800
Tag:    v2.5.0-beta

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

commit e2c7333c2ed1cc76cbfa82bbcc0870b4b98f655b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 01:18:05 +0800
Tag:    v2.3.7

Merge branch 'w12_MDL-38329_m23_webkit' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit f0f28e3c3bb7d46b9d71dbcfed5a4c49cfbf3f19
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 01:17:35 +0800
Tag:    v2.4.4

Merge branch 'w12_MDL-38329_m24_webkit' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 4e37889c4124fa825187a2713447a0bcf2666ea9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 01:17:11 +0800
Tag:    v2.5.0-beta

Merge branch 'w12_MDL-38329_m25_webkit' of git://github.com/skodak/moodle

commit 66f1870701de720c3b42b5764d7096b01aea0728
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 00:58:55 +0800
Tag:    v2.5.0-beta

Merge branch 'w12_MDL-38180_m25_enrolpics' of git://github.com/skodak/moodle

commit 58b9cd031f46b661b113c4ecd01468ed82c8dfb1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 00:16:32 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38497-admintree-beforesibling' of git://github.com/mudrd8mz/moodle

commit 83ba845de9f09ffdd8303e16c1661d8b3918d7c8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 23:51:45 +0800
Tag:    v2.5.0-beta

Merge branch 'w12_MDL-38202_m25_loginas' of git://github.com/skodak/moodle

commit b2b512671d55ae6654896a21c7d8905f0ab681c9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 23:49:45 +0800
Tag:    v2.3.7

Merge branch 'MDL-38542_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 59faf92e1f2289ed717f35ca0b6ab300c724a5ad
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 23:49:23 +0800
Tag:    v2.4.4

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

commit b81d5eab90fd877090d77d4454a5e88d85083dd4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 23:48:37 +0800
Tag:    v2.5.0-beta

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

commit 6211a05866d9c15e0a808b83236028e489a6ee35
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 23:35:41 +0800
Tag:    v2.3.7

Merge branch 'MDL-38444_23' of https://github.com/ppichet/moodle into MOODLE_23_STABLE

commit 332e3c015314711b42efbf165e699342140b1b26
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 23:35:30 +0800
Tag:    v2.4.4

Merge branch 'MDL-38444_24' of https://github.com/ppichet/moodle into MOODLE_24_STABLE

commit 1e1815bead3ba8e4e5d807464d65bdd912643265
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 23:33:28 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38444' of https://github.com/ppichet/moodle

commit 7c27e34742ad9f737cbe7ab05e63aa24eeefdb78
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 20:31:46 +0800
Tag:    v2.5.0-beta

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

commit 7761a38737c8844f65c0115c944356df16e5062e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 20:22:50 +0800
Tag:    v2.5.0-beta

Merge branch 'w12_MDL-38319_m25_roleperf' of git://github.com/skodak/moodle

commit 1816c69c3f7f5194daf9bb3be252d2435b533b2b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 20:17:51 +0800
Tag:    v2.5.0-beta

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

commit dd8ec000671a79d45dc762af2277b80eda4fc99a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 19:58:42 +0800
Tag:    v2.3.7

Merge branch 'MDL-38515-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE

commit 38b7d50139247380006be4ebbdd03192b4cd5745
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 19:58:07 +0800
Tag:    v2.4.4

Merge branch 'MDL-38515-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE

commit e6307294434120b2093678a7373a818998f38a95
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 19:51:47 +0800
Tag:    v2.5.0-beta

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

commit 09fe13d1235deef2e0526e1217b16952fa43570a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 19:34:45 +0800
Tag:    v2.5.0-beta

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

commit a3db3bfac030abdc32ef851cc6b3651bd637c36e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 19:29:01 +0800
Tag:    v2.3.7

Merge branch 'MDL-38397_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit f6a52da112ae15637f689c29ee80d33baeec676a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 19:28:52 +0800
Tag:    v2.4.4

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

commit 70ca00653818c8eb5ef1986e5cc34ed23bbe7a86
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 19:28:01 +0800
Tag:    v2.5.0-beta

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

commit cf9b57d181c4bb5bd468e8ae6301f1fa7dc5919e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 17:24:45 +0800
Tag:    v2.3.7

Merge branch 'wip-mdl-38431-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit d4ce77f6248ed7b628200d7691365eae40411a1f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 17:24:39 +0800
Tag:    v2.4.4

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

commit 5272b7a70fd078f4d569ac66507b4901beb54805
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 17:24:23 +0800
Tag:    v2.5.0-beta

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

commit 28896f12f70fcf08ca72c4e45b55b0e36152ef06
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 16:37:31 +0800
Tag:    v2.3.7

Merge branch 'MDL-36872-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit 834a0c1a55837968cc35acd531f7404613bf8dfe
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 16:37:24 +0800
Tag:    v2.4.4

Merge branch 'MDL-36872-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE

commit bacd6a6f326dae228530d14ae9f6f61842b41935
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 16:36:43 +0800
Tag:    v2.5.0-beta

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

commit 668a62ef808d8f5a73b8e34d790e87e1f4d84f92
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 08:46:11 +0800
Tag:    v2.5.0-beta

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

commit 03deed4f750db390f0b1156e942df126c9f737f4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 06:56:34 +0800
Tag:    v2.5.0-beta

Merge branch 'w12_MDL-36198_m25_yuireset' of git://github.com/skodak/moodle

commit 51f55920b5041c76d49f4248eb5ad5bdf8fc07d4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Mar 2013 08:14:59 +0800
Tag:    v2.3.6

Merge branch 'MDL-38268-m23' of https://github.com/jfilip/moodle into MOODLE_23_STABLE

commit eeb0efd7d83834c66243ea9ee007c30a76c0a8fe
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Mar 2013 08:14:38 +0800
Tag:    v2.4.3

Merge branch 'MDL-38268-m24' of https://github.com/jfilip/moodle into MOODLE_24_STABLE

commit 2a28b5d4adcc2aacdeee4cb3f9858faa75bcfd8d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Mar 2013 08:14:03 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38268-master' of https://github.com/jfilip/moodle

commit a558b8415bbcec36a8f279d3a5063b8434a9c7b4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Mar 2013 08:09:59 +0800
Tag:    v2.3.6

Merge branch 'MDL-30166-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit ddaf467f311ba36e68f6a993a335f9bb60eb3d9b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Mar 2013 08:09:31 +0800
Tag:    v2.4.3

Merge branch 'MDL-30166-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE

commit 0e5781a7ffd066b13dc046033b632b20e36f9116
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Mar 2013 08:08:26 +0800
Tag:    v2.5.0-beta

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

commit cf6fdbd1b070913f4622e5d8cb8762f8f4b66e13
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Mar 2013 05:58:12 +0800
Tag:    v2.3.6

Merge branch 'wip-mdl-38332-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit b3a5ae03d06a5b9bcc8347c1d3cd28572db59f05
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Mar 2013 05:53:16 +0800
Tag:    v2.4.3

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

commit 2472cdd305160e0b4cf52d3cb5f7e1174acaf9ba
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Mar 2013 05:50:32 +0800
Tag:    v2.5.0-beta

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

commit 63b738a177d1b85d6b72e66e34dbd15e839c1a78
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Mar 2013 23:02:39 +0800
Tag:    v2.5.0-beta

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

commit 761dfda279e724536b84e129bf752776030070e3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Mar 2013 07:55:19 +0800
Tag:    v2.3.6

Merge branch 'MDL-34774_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit 2f286d765831130e5c4a1d194a2aca259879cef0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Mar 2013 07:55:05 +0800
Tag:    v2.4.3

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

commit b2ccf75484a696ebf4804c5365ff2957758ce2be
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Mar 2013 07:54:53 +0800
Tag:    v2.5.0-beta

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

commit 8aa0a1423b5de92c24a9425bc97fc1487f8d5b42
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Mar 2013 07:50:50 +0800
Tag:    v2.5.0-beta

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

commit 705d41c895292b89aec658f441a1f90e3c1d4002
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Mar 2013 07:45:59 +0800
Tag:    v2.5.0-beta

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

commit 8ed6ee97a64c8ebd808c06b095a08c9d973c3a5f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Mar 2013 07:43:38 +0800
Tag:    v2.5.0-beta

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

commit e314a6436e4cc2f95266af900e8342a549647e42
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Mar 2013 07:38:37 +0800
Tag:    v2.5.0-beta

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

commit 57b9d94e8974d3345fd45cb55d03cdf11fb37876
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Mar 2013 07:25:21 +0800
Tag:    v2.3.6

Merge branch 'MDL-38337_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 7b8110d4b0a911a1a343c4ae8036ce4499701970
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Mar 2013 07:25:13 +0800
Tag:    v2.4.3

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

commit bf3a44afbe38d164fd46309768e873e09ce90cc3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Mar 2013 07:25:05 +0800
Tag:    v2.5.0-beta

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

commit 4f558e2741cd8f64fd75e5dadf02cb351cfd130b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Mar 2013 07:22:33 +0800
Tag:    v2.3.6

Merge branch 'MDL-34818_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit 6a34b93223441c8b68a302123539f9b47fd9324b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Mar 2013 07:22:27 +0800
Tag:    v2.4.3

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

commit ab7cb04fb842ad2c9c0575761ec5fb265f359c23
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Mar 2013 07:22:18 +0800
Tag:    v2.5.0-beta

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

commit c9b9abc09071229231a69791bf33338573e4d92e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Mar 2013 07:05:02 +0800
Tag:    v2.4.3

Merge branch 'wip_24_mdl-38262' of git://github.com/iarenaza/moodle into MOODLE_24_STABLE

commit 35049887b9f5d9a97ceef41e84b6cad357ca9d31
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Mar 2013 07:04:04 +0800
Tag:    v2.5.0-beta

Merge branch 'wip_master_mdl-38262' of git://github.com/iarenaza/moodle

commit 3523c45b0cc75077365025d4fb81efaf687bcea7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Mar 2013 23:16:54 +0800
Tag:    v2.5.0-beta

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

commit 20cb544cdd87be4dbd15f561ce7cf51509fb1247
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Mar 2013 23:16:40 +0800
Tag:    v2.4.2

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

commit 48cafb2b24cc13565d2646b5ed0d6fc35c7bd8bf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Mar 2013 23:16:27 +0800
Tag:    v2.3.5

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

commit ab63c43a0325c0c5f72b28ef925f857606cf7f8e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Mar 2013 23:16:13 +0800
Tag:    v2.2.8

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit d79759cef9a1ec320f0ddca665bb62b83a1c6c44
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Mar 2013 18:45:06 +0800
Tag:    v2.5.0-beta

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

commit b9f3138dbe8c6d301c9b128c479cca803df6e4aa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Mar 2013 01:35:33 +0800
Tag:    v2.5.0-beta

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

commit f73c7d410bc46243183ce1bb6002488410f70826
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Mar 2013 00:55:19 +0800
Tag:    v2.4.2

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

commit 5379574a7d65a22cfdf9bb51d5f55a376d07434a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Mar 2013 00:54:42 +0800
Tag:    v2.3.5

Merge branch 'MDL-38173-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

commit c5c1f0745310af52887e98853d2aaea42a040877
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Mar 2013 00:28:35 +0800
Tag:    v2.3.5

Merge branch 'MDL-38352-en_fix_23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE

commit f4b9cea5fc195fe8e44122f1078e1f09bb677ea0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Mar 2013 00:28:19 +0800
Tag:    v2.4.2

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

commit 641577eb322416af1eb13b21f713c61ff6605eea
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Mar 2013 00:26:37 +0800
Tag:    v2.5.0-beta

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

commit 69d012938967435537a8d7fc9df90d2c61475f67
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 06 Mar 2013 17:36:24 +0800
Tag:    v2.5.0-beta

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

commit 4384eea0c9797e38a49bdcf1a4b1555e9e148cdd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 06 Mar 2013 17:31:20 +0800
Tag:    v2.5.0-beta

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

commit ee7251689f5c3082c607178b489a9175459d8080
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 06 Mar 2013 08:24:22 +0800
Tag:    v2.3.5

Merge branch 'MDL-38311_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit ef01018a00942c0b25e3aa22c79de7069a18e272
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 06 Mar 2013 08:24:11 +0800
Tag:    v2.4.2

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

commit 9f4da038c828f053073629504ca7397244d58afa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 06 Mar 2013 08:22:32 +0800
Tag:    v2.5.0-beta

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

commit ab1e921c310838aac6ac0b3933d06c7e3119507c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 06 Mar 2013 08:19:17 +0800
Tag:    v2.5.0-beta

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

commit 88906d068d309b4df6234e5dbd39ed135fe7a629
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 06 Mar 2013 02:28:14 +0800
Tag:    v2.5.0-beta

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

commit 8d0a04226326b985493672de0aca9eed016d641f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 06 Mar 2013 02:26:52 +0800
Tag:    v2.5.0-beta

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

commit 9af30e60b55539fb30beddb3275b1a9a02795ee9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 06 Mar 2013 01:12:55 +0800
Tag:    v2.5.0-beta

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

commit 9aa0a709cd985f8bd61ee521c02715d8233cfde1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 06 Mar 2013 01:00:31 +0800
Tag:    v2.3.5

Merge branch 'MDL-37642-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE

commit 76cab144c8fa36d2061e86b08be9f2522876bac5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 23:46:05 +0800
Tag:    v2.3.5

Merge branch 'MDL-38119_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit add7b5a25047a870c1be0061a9d1a9b72ddc2abc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 23:45:42 +0800
Tag:    v2.4.2

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

commit af733564f4bfd7447b490f8c645b468d86fcb6af
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 23:45:01 +0800
Tag:    v2.5.0-beta

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

commit 4afd580231b8c80a3ff52165a20351bfa7845d56
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 22:43:15 +0800
Tag:    v2.5.0-beta

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

commit c6014dccd99ce980fd1f10c5577795713890e618
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 08:28:15 +0800
Tag:    v2.3.5

Merge branch 'wip-MDL-36215-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE

commit 29f07d932ad17637646c2e59529e6f1705dcccff
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 08:28:03 +0800
Tag:    v2.4.2

Merge branch 'wip-MDL-36215-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit 86d053490d5705d3caded411557f41aa6549ed71
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 08:27:50 +0800
Tag:    v2.5.0-beta

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

commit 2b48123b92d89230d07201f1e3977656f9800ef1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 08:21:47 +0800
Tag:    v2.5.0-beta

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

commit caa5bcea00934ff9f8f261912c4b19f6600b1c86
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 08:08:23 +0800
Tag:    v2.5.0-beta

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

commit fd0c4855840ba33ae9e32b3101c0e69ab70ccad1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 08:03:26 +0800
Tag:    v2.5.0-beta

Merge branch 'm25_MDL-37515_Notice_when_submitting_change_password_form' of https://github.com/scara/moodle

commit adc4aca4755005b670503651e3445d6c77992a75
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 07:56:24 +0800
Tag:    v2.5.0-beta

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

commit cdbbd48a66640428317a0b035f3bc873b7bf4788
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 07:48:47 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38261-workshop-attachments-size' of git://github.com/mudrd8mz/moodle

commit 62bf37d8f52ea3a4001ffdfdd486faacc82dd3b6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 07:46:12 +0800
Tag:    v2.5.0-beta

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

commit 032b80ea4b7f8f07257d3e17375106efc34ecb06
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 06:45:21 +0800
Tag:    v2.4.2

Merge branch 'wip-MDL-32975-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit 267325491917da9e6ff27062e8476f967f6b48d4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 06:03:46 +0800
Tag:    v2.5.0-beta

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

commit d47f3d499cad677eb2545a3a627e33688cbc8b2d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 03:47:15 +0800
Tag:    v2.3.5

Merge branch 'MDL-37522-published-attachment_23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE

commit 083b0a54aa728c498b3ed98cf174f4f8bf9870c7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 03:47:02 +0800
Tag:    v2.4.2

Merge branch 'MDL-37522-published-attachment_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE

commit 1de87afc243638d0cdd6c72a4708c687d3f22ed1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 03:46:41 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37522-published-attachment' of git://github.com/mudrd8mz/moodle

commit 25ba263d608c8b7f989a9c87a7deaed9b6e24ff2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 03:37:57 +0800
Tag:    v2.5.0-beta

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

commit d03d5e7816dbcbb9f5e4e7f5ada3979e2be45587
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 03:18:48 +0800
Tag:    v2.5.0-beta

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

commit 6c2dec31f5054b0b95d443b09e1f349e5527d4ef
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 03:18:37 +0800
Tag:    v2.4.2

Merge branch 'wip-MDL-33013-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit a366e1282abe449f3e244365802f7922fe66ad1b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 03:17:12 +0800
Tag:    v2.3.5

Merge branch 'wip-MDL-33013-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE

commit 5a341e9183b354edc1cd2ba8d81ee9618cb20405
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 01:08:54 +0800
Tag:    v2.5.0-beta

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

commit 48f3a2495b2c2bd5d179234ef0e13fd946c384f3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 01:00:15 +0800
Tag:    v2.3.5

Merge branch 'MDL-36380-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 4856fb65b258c3b48d180fbb113e899bdbaa22e8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 01:00:03 +0800
Tag:    v2.4.2

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

commit 8b0f09d940ec09eef5a2068e89baf87a926f5ac4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 00:59:39 +0800
Tag:    v2.5.0-beta

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

commit 328b5eab5ceea9999c072caf00c3be4b760ffd62
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 04 Mar 2013 23:43:09 +0800
Tag:    v2.3.5

Merge branch 'wip-MDL-37983-23' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE

commit bbdbe0a4909ef61ca599cb21a431e29617b82618
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 04 Mar 2013 23:43:00 +0800
Tag:    v2.4.2

Merge branch 'wip-MDL-37983-24' of git://github.com/abgreeve/moodle into MOODLE_24_STABLE

commit 266e8dec4918ae97327e2366bfa90cf3ea7f9eef
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 04 Mar 2013 23:42:25 +0800
Tag:    v2.5.0-beta

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

commit c3dd18842bc9e99e8ce4569f57181266889c9a80
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 04 Mar 2013 23:26:25 +0800
Tag:    v2.3.5

Merge branch 'MDL-38170-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE

commit 26431c6f948a6636ebb3f64347c406a7a5767d1f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 04 Mar 2013 23:26:07 +0800
Tag:    v2.4.2

Merge branch 'MDL-38170-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE

commit d5834b37121167b9020c2a9efc1c84203264e669
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 04 Mar 2013 23:25:00 +0800
Tag:    v2.5.0-beta

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

commit 653c7d4a27fdbb07f79a49a3c55c0d33746a7d73
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 04 Mar 2013 10:01:21 +0800
Tag:    v2.4.2

Merge branch 'wip-MDL-38205-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit 15d427c82d82679768b32f983a2e0c7a27cea353
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 04 Mar 2013 10:01:11 +0800
Tag:    v2.5.0-beta

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

commit 8b0318d538f491fc6bf097b754322a9a52787ade
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 04 Mar 2013 06:07:45 +0800
Tag:    v2.4.2

Merge branch 'wip-MDL-38165-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit 52f0c094f539c651632e2a5d16d8f9c417f395ae
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 04 Mar 2013 06:07:05 +0800
Tag:    v2.5.0-beta

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

commit 49025ce156ba3e3e21ad6b5390a7abbe979cbe28
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 28 Feb 2013 22:40:57 +0800
Tag:    v2.2.8

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit 119d68fa19c1b2f5cbedd0fc5fe934f9f98f267f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 28 Feb 2013 22:40:45 +0800
Tag:    v2.3.5

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

commit eac27523b5dc24397b5048dd98eab86be0af6179
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 28 Feb 2013 22:40:31 +0800
Tag:    v2.4.2

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

commit 5524bab53d92edd167ad487d6d4718d8c17334a7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 28 Feb 2013 22:40:15 +0800
Tag:    v2.5.0-beta

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

commit 738b0965a4968de76226a5ba2abe0027c2504d7e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Feb 2013 01:12:15 +0800
Tag:    v2.5.0-beta

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

commit 2c4293ce906c5384a3ef7e6a177061cb04a0d57a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Feb 2013 20:23:34 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-31885-smartcache' of git://github.com/marinaglancy/moodle

commit c4d0c8ada2d0a8fc9ccbb00bf649698a9afb21ab
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Feb 2013 19:43:42 +0800
Tag:    v2.3.5

Merge branch 'wip_MDL-35641_m23_flowbackport' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit f881b74bd856d99f7c36415c013ff6907c5e44cb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Feb 2013 17:14:51 +0800
Tag:    v2.4.2

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

commit 36650d6f516c3a4b179b58077cc3f99741348c81
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Feb 2013 17:14:28 +0800
Tag:    v2.5.0-beta

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

commit 46e120c561c4239ae715475e10efbb148abbc43a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Feb 2013 17:06:14 +0800
Tag:    v2.5.0-beta

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

commit 9515c34ee683a6d62c1c8060000734d60c59820f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Feb 2013 16:46:13 +0800
Tag:    v2.5.0-beta

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

commit 6b068d6643e96a4a2bbc81607572c68ecbb53996
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Feb 2013 10:02:19 +0800
Tag:    v2.2.8

Merge branch 'MDL-38003_m22' of https://github.com/markn86/moodle into MOODLE_22_STABLE

commit a5ce98d52fd35189e16f6393654896b89bb10370
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Feb 2013 08:29:10 +0800
Tag:    v2.4.2

Merge branch 'wip-MDL-38162-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit fd6e1aaadbbe27b0a8797f5a3ad7f09e12e9f6ab
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Feb 2013 08:28:56 +0800
Tag:    v2.5.0-beta

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

commit 64870338c44fa25bb3816bd212f10629703702d9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Feb 2013 08:25:58 +0800
Tag:    v2.5.0-beta

Merge branch 'w08_MDL-37963_m25_usergen' of git://github.com/skodak/moodle

commit b1ed9f69703432170dcc63d6afddf31b4339d87e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Feb 2013 08:19:29 +0800
Tag:    v2.5.0-beta

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

commit c45593c6d8911babdae00a90080bfd5c3a915e83
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Feb 2013 07:48:22 +0800
Tag:    v2.5.0-beta

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

commit 1e171d4d37c7c51692d172cb06b3073e9004e1af
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Feb 2013 07:33:32 +0800
Tag:    v2.5.0-beta

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

commit 2a80528fd6d67dcb1574c04d2324e45f63a32abf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Feb 2013 06:52:20 +0800
Tag:    v2.5.0-beta

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

commit 8615b484b217d80759596905a5b025617a261b9a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Feb 2013 06:51:20 +0800
Tag:    v2.5.0-beta

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

commit 05fc7ccc8278ac3728a986a7437fbae94fbd79ec
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Feb 2013 06:38:20 +0800
Tag:    v2.5.0-beta

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

commit 5d719ed8ece03a65e38fbea4eb205957f39bfad8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Feb 2013 07:49:04 +0800
Tag:    v2.3.5

Merge branch 'wip-MDL-37224-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE

commit 49ac497117b36dd7615721e4a1e1b4dcb701d533
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Feb 2013 07:48:50 +0800
Tag:    v2.4.2

Merge branch 'wip-MDL-37224-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit 349c224817566ef8aac2a19e56315eb28fee1759
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Feb 2013 07:48:12 +0800
Tag:    v2.5.0-beta

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

commit c5d3cf1da301976393b788c2b754abbbf1208ed6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Feb 2013 07:46:29 +0800
Tag:    v2.3.5

Merge branch 'wip-MDL-34298-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE

commit ee04accfbaa0fe51ab15b689141d07a183a03ef9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Feb 2013 07:46:24 +0800
Tag:    v2.4.2

Merge branch 'wip-MDL-34298-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit ca1774aea40ab81fde8441da1be648e58d5312d8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Feb 2013 07:45:50 +0800
Tag:    v2.5.0-beta

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

commit b70a3b7106e2db6d01074e18ad229e7d20414e13
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Feb 2013 07:44:54 +0800
Tag:    v2.5.0-beta

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

commit a5c0643a1dabdd372b3535b590fa67ce44d571a8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Feb 2013 07:40:32 +0800
Tag:    v2.3.5

Merge branch 'MDL-37894_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 5ddaf0a8ffd72b68a164551bba6180a10a8c75bf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Feb 2013 07:40:21 +0800
Tag:    v2.4.2

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

commit f1b011d3a871acd46e793dbd2ac733b0a609a4aa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Feb 2013 07:39:44 +0800
Tag:    v2.5.0-beta

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

commit a6a1b51259e3ad19ec855625842762d3d2b94a8f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Feb 2013 07:34:58 +0800
Tag:    v2.3.5

Merge branch 'MDL-37967_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE

commit 097404cd2bb38cfb8497e319dc210625479b330e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Feb 2013 07:34:36 +0800
Tag:    v2.4.2

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

commit d2761b3aaddfb1a238717644f529baa6c3e96a88
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Feb 2013 07:32:19 +0800
Tag:    v2.5.0-beta

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

commit 26581a7420a018746d046ea0602ef99ddf3a3f5b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Feb 2013 07:10:35 +0800
Tag:    v2.5.0-beta

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

commit f8ecf7f7defed494d82df5f12a21623a0875f82a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Feb 2013 07:08:03 +0800
Tag:    v2.3.5

Merge branch 'wip-MDL-38075-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE

commit 950fead1058488c7384ecc76fa4d32dfebfcc2d7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Feb 2013 07:07:47 +0800
Tag:    v2.4.2

Merge branch 'wip-MDL-38075-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit 4e6bb9d315dbcb78aac026e4dc45b69f9ab9d1ea
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Feb 2013 07:07:17 +0800
Tag:    v2.5.0-beta

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

commit 80ba3a43902af16d72f849c4d153150fa198aa40
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Feb 2013 07:01:47 +0800
Tag:    v2.5.0-beta

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

commit 41e94a8d6f58d1014024138e848f6b4fe5eb11b4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Feb 2013 06:26:09 +0800
Tag:    v2.5.0-beta

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

commit 1ead0c63e9cdbdb80a64052c42cf93caf46573b4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Feb 2013 20:13:43 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-32620' of git://github.com/scriby/moodle

commit 57691c32b7658e4cef5e9c74dc45c3323686bfc4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Feb 2013 20:02:56 +0800
Tag:    v2.5.0-beta

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

commit 345768b9b80905e8e3aa116cf08497a67c1a1118
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Feb 2013 19:57:10 +0800
Tag:    v2.5.0-beta

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

commit e9d41cebe5d40ed56cdd233d67e9113098190228
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Feb 2013 19:50:25 +0800
Tag:    v2.4.2

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

commit a5b1f1e2f272b901938606c2ebb826106573b3f6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Feb 2013 19:46:36 +0800
Tag:    v2.5.0-beta

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

commit f5d26c95e8cd6665e96c3aaf90e90a6f73d92f99
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Feb 2013 19:24:41 +0800
Tag:    v2.3.5

Merge branch 'MDL-38033_dnd_uppercase_extn_23' of git://github.com/davosmith/moodle into MOODLE_23_STABLE

commit b5476a34bc53e3e87e21819ed06f4ae8f30f9e85
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Feb 2013 19:24:24 +0800
Tag:    v2.4.2

Merge branch 'MDL-38033_dnd_uppercase_extn_24' of git://github.com/davosmith/moodle into MOODLE_24_STABLE

commit 8337ed1e695b84c365690fec48d54ca8614c4082
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Feb 2013 19:23:41 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38033_dnd_uppercase_extn' of git://github.com/davosmith/moodle

commit 6033723098e16d359d1bfc0c745da8989bfdce5b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Feb 2013 05:49:05 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37598-abort-after-config' of git://github.com/mudrd8mz/moodle

commit fe4a6d3c38db15126740757de62ceb7b0c65895d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Feb 2013 17:12:01 +0800
Tag:    v2.5.0-beta

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

commit 7fe9a7863a8afe46cbbc85f6a51708241a6820e3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Feb 2013 17:07:58 +0800
Tag:    v2.5.0-beta

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

commit 79cccda3a94ec7a6bcd4a83cf690e169e671e412
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Feb 2013 17:04:40 +0800
Tag:    v2.3.5

Merge branch 'MDL-37893-grouped-empty_23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE

commit 553e19b4434ad01ac6f27ee87a7e89c46e79ae52
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Feb 2013 17:04:12 +0800
Tag:    v2.4.2

Merge branch 'MDL-37893-grouped-empty_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE

commit b57f62c497416af41a38c8e17e46cd1080f9b390
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Feb 2013 17:02:23 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37893-grouped-empty' of git://github.com/mudrd8mz/moodle

commit bced529e0e0cfc5ad5a7b1a0e676d905da786325
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Feb 2013 08:21:12 +0800
Tag:    v2.3.5

Merge branch 'MDL-37943_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit d3a2b631437a98f5409952dfab70290dafef7c8b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Feb 2013 08:21:06 +0800
Tag:    v2.4.2

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

commit e8e6802225a3fab892f181d871a973569eff707c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Feb 2013 08:20:56 +0800
Tag:    v2.5.0-beta

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

commit ce9c32363577b8cb5f718b1921ed33fe02422547
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Feb 2013 08:16:48 +0800
Tag:    v2.5.0-beta

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

commit 596881dbafbf85e99b3628c07209557611212612
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Feb 2013 08:14:43 +0800
Tag:    v2.3.5

Merge branch 'MDL-37896_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 017382e6d3511811fb8c0a966ade2be58989282f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Feb 2013 08:14:24 +0800
Tag:    v2.4.2

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

commit 625d5f8164e3c2a5d3f4071e09b93327c96e060d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Feb 2013 08:13:18 +0800
Tag:    v2.5.0-beta

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

commit ef1a4d20d4ff6b7ac175a19b86c4db52a89943d0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Feb 2013 08:07:43 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37919-phpunit-exception' of git://github.com/mudrd8mz/moodle

commit c27b257b1423b8a24c495ad19d31bc2e67c42ea0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Feb 2013 08:00:16 +0800
Tag:    v2.3.5

Merge branch 'MDL-35037-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit 2c9a28bbe6df74ca40db9d67cac775942670a8ac
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Feb 2013 07:59:56 +0800
Tag:    v2.4.2

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

commit 9a061c328596946783ae92b1b2ea95e1f05df9b0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Feb 2013 07:59:39 +0800
Tag:    v2.5.0-beta

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

commit 65412c365d351421db463738a0eb8b1c7bf7d623
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Feb 2013 07:43:38 +0800
Tag:    v2.5.0-beta

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

commit e196517bf52cbeb67ace8b7dfeb6d1994fff34ca
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Feb 2013 06:31:38 +0800
Tag:    v2.5.0-beta

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

commit d220e90fbf38fc1ef78da0e2df6fb424b48e983a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Feb 2013 08:07:04 +0800
Tag:    v2.5.0-beta

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

commit 9cb6ecd9aa6e53ab1d1e9438a3ee8c46eaaba820
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 18:24:11 +0800
Tag:    v2.3.5

Merge branch 'MDL-37854_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE

commit b626992e09a90c83f7be08826dc3e7fa665f0456
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 18:19:30 +0800
Tag:    v2.4.2

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

commit 5ab0371d74f5abb48958b5b628ecf3c9a653bd69
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 18:10:48 +0800
Tag:    v2.5.0-beta

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

commit 6617125ca400ff7b1f6bc580e202ddf9634159c1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 17:19:06 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37870-progressive_parser_exception' of git://github.com/mudrd8mz/moodle

commit b97d3e46df94b559c4b25c90f750cf718abb034a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 08:28:35 +0800
Tag:    v2.5.0-beta

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

commit d86b640958872db014f611374cfaa827b172dfda
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 08:14:27 +0800
Tag:    v2.3.5

Merge branch 'MDL-37566-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE

commit 4ce7de34ca4ec8e8eaaf6366a4ca852c1db106da
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 08:14:21 +0800
Tag:    v2.4.2

Merge branch 'MDL-37566-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE

commit b7c238798cc205b15cbea0dfe8e30b7ba75d4cb7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 08:14:07 +0800
Tag:    v2.5.0-beta

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

commit 1df33d5427ac583454f2d6eb818cbd24cbcc20b0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 08:06:40 +0800
Tag:    v2.5.0-beta

Merge branch 'w04_MDL-37780_m25_wintests' of git://github.com/skodak/moodle

commit 70e963ea9cfa4266a5dd17a2dc1b07b93a00de29
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 08:01:14 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37801_glossary_links' of git://github.com/davosmith/moodle

commit dc5957d568022d02c81ba4780a354d0b84e1a60d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 07:57:40 +0800
Tag:    v2.3.5

Merge branch 'MDL-37775_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit 52c86533d9da5bb70a2f90c1d926f10810b1bed7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 07:57:33 +0800
Tag:    v2.4.2

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

commit fc395e02f740ee7b71f7c9c03916204ff63e215b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 07:57:20 +0800
Tag:    v2.5.0-beta

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

commit da46d05239184a55a96b1bc522ef7aa5ffe264a9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 07:36:24 +0800
Tag:    v2.3.5

Merge branch 'MDL-37785_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit 47ae7ebe35fc8d0b57ac5b5d41fe3a4375495ca5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 07:36:13 +0800
Tag:    v2.4.2

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

commit a0c3faeaefbb1671d338752187ab9354751dc779
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 07:35:24 +0800
Tag:    v2.5.0-beta

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

commit 93f09e3ba8e545064bab6dec4dc1eef3afd1268e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 07:28:41 +0800
Tag:    v2.3.5

Merge branch 'MDL-37523_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit e42c4ee260fbfeafa29bc4ba3d8891906f0c7a3c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 07:28:32 +0800
Tag:    v2.4.2

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

commit f941a7864b4574c9800aca761b1e4f4563d393db
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 07:28:10 +0800
Tag:    v2.5.0-beta

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

commit 125d26d23ce930d71c11c4cf89360ecf9b711ab3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 07:14:01 +0800
Tag:    v2.4.2

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

commit 208f59137a92e4484407e5b82d72fcfcd2832da1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 07:13:48 +0800
Tag:    v2.5.0-beta

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

commit 1615caae6f571e339f564a949684a564e058f0ed
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 07:08:44 +0800
Tag:    v2.5.0-beta

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

commit bd11fca3aa9ce370230bb3729fa5a96315caad42
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 06:59:14 +0800
Tag:    v2.4.2

Merge branch 'm24_MDL-33078' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE

commit 8d8f9cf756b5258769d88cd2b86d8a78c532ad89
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 06:58:41 +0800
Tag:    v2.5.0-beta

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

commit 34c5ea24f327e57bfd5bf546a8240523030b1c26
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 05:56:24 +0800
Tag:    v2.3.5

Merge branch 'MDL-37847_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 65828d865244873d2a3e613a48cc1c4ef1d9463f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 05:56:03 +0800
Tag:    v2.4.2

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

commit a35a7644b993795e055adb9bb4abf714eb1b368a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 05:54:50 +0800
Tag:    v2.5.0-beta

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

commit 60b1ed130363d077c8a0891e36e237015a4c3d66
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 31 Jan 2013 17:44:46 +0800
Tag:    v2.2.8

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit f97db0197841ca20e15028eb6de3d25dc7f2e46b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 30 Jan 2013 17:27:11 +0800
Tag:    v2.5.0-beta

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

commit 2cc964855514548c8cf1b89c6e60275c0a7d687f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 30 Jan 2013 08:23:44 +0800
Tag:    v2.3.5

Merge branch 'w04_MDL-37734_m23_marshack' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 498a14ef8b4496ddfb535318fe1aaf009e97a15f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 30 Jan 2013 08:23:36 +0800
Tag:    v2.4.2

Merge branch 'w04_MDL-37734_m24_marshack' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit fb44a5db6f1ed7024cbae258fdfa985c6860a2b8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 30 Jan 2013 08:11:20 +0800
Tag:    v2.5.0-beta

Merge branch 'w04_MDL-37734_m25_marshack' of git://github.com/skodak/moodle

commit 6ca12c1cc192b36213f6c740ed4236ee84d63562
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 30 Jan 2013 07:51:01 +0800
Tag:    v2.5.0-beta

Merge branch 'w04_MDL-37767_m25_pgsocket' of git://github.com/skodak/moodle

commit e2b2794368f49f3fba2cdcdce293fc8616338791
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 30 Jan 2013 06:38:43 +0800
Tag:    v2.5.0-beta

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

commit 857b40256e747b8cfc897c0d9e7c476958c3cb3e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 30 Jan 2013 06:33:22 +0800
Tag:    v2.5.0-beta

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

commit a917ef63aec00af3d6f00e6acdd0bd5375982e2b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 30 Jan 2013 02:19:29 +0800
Tag:    v2.5.0-beta

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

commit 6e607d44c01de460f506433fec5a7501c070ee1b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Jan 2013 22:35:20 +0800
Tag:    v2.3.5

Merge branch 'MDL-37533-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

commit f89712dc6d8a39ce40b742462aa156d99f5f1497
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Jan 2013 22:35:14 +0800
Tag:    v2.4.2

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

commit 96b997d759318c60099788b65f03681ffc765608
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Jan 2013 22:35:05 +0800
Tag:    v2.5.0-beta

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

commit 0ed03cc295448048b5bf293873658eed6d791015
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Jan 2013 22:19:11 +0800
Tag:    v2.5.0-beta

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

commit becce23e4aaa80866313bdbd1ef3465a8e65a475
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Jan 2013 19:06:43 +0800
Tag:    v2.4.2

Merge branch 'wip-MDL-36363-m24' of https://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit 6155915ffbba47b36be1a17d8d6cddb99182130e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Jan 2013 19:06:33 +0800
Tag:    v2.5.0-beta

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

commit 09d6bcc2325da9b66dfc0f93eeea098592e88351
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Jan 2013 08:33:08 +0800
Tag:    v2.5.0-beta

Merge branch 'w04_MDL-37718_m25_rs' of git://github.com/skodak/moodle

commit ee4cac2b44c32b6527165ec7c2f1fcb02c16aee3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Jan 2013 08:32:09 +0800
Tag:    v2.5.0-beta

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

commit 18d4c3120aedd2340aedc1f8187f411fdb40ecb9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Jan 2013 02:23:25 +0800
Tag:    v2.4.2

Merge branch 'wip-MDL-37545-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit fab951a6ae11f2a9c229dc28c07cf8503b857bc3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Jan 2013 02:23:17 +0800
Tag:    v2.5.0-beta

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

commit c9c75b39fd1b5c2e10ddd9e5d43be87fdd9d544e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Jan 2013 09:07:53 +0800
Tag:    v2.5.0-beta

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

commit 24430c5aadc6f61a9e1a67699885a8fece4f60d6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Jan 2013 03:40:56 +0800
Tag:    v2.3.5

Merge branch 'wip-MDL-15930-23' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE

commit 5afd8bfedee694a844377c84212eb4f953451d28
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Jan 2013 03:34:42 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-15930-master' of git://github.com/abgreeve/moodle

commit d31a080f91e83093fc52582be80daa0764d04c97
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Jan 2013 03:33:06 +0800
Tag:    v2.4.2

Merge branch 'wip-MDL-15930-24' of git://github.com/abgreeve/moodle into MOODLE_24_STABLE

commit cccdddf2416a9556f05272c5e50a45cc704ab73f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Jan 2013 09:10:47 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37539-master' of github.com:damyon/moodle

commit b210380b4e5fff02783262db1d353ceeaaf2f2e5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Jan 2013 08:20:06 +0800
Tag:    v2.3.5

Merge branch 'MDL-36104_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE

commit d828e8c6789ce6319d5038261f83b1c1e61d9bcc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Jan 2013 08:19:52 +0800
Tag:    v2.4.2

Merge branch 'MDL-36104_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE

commit 0aaf378cf958fca34534ee45138d204ccc5dd778
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Jan 2013 08:11:48 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36104_master' of https://github.com/markn86/moodle

commit 19740fe4a6dd74f528579e19a595e119a292efb3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Jan 2013 08:06:23 +0800
Tag:    v2.3.5

Merge branch 'MDL-37539-23' of github.com:damyon/moodle into MOODLE_23_STABLE

commit b1886826de6c0cba0f0f179a8d3d27d38739c9c7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Jan 2013 08:06:13 +0800
Tag:    v2.4.2

Merge branch 'MDL-37539-24' of github.com:damyon/moodle into MOODLE_24_STABLE

commit 17f394f81a8990471a835ecae941c38194e797bf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Jan 2013 08:05:54 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37539-master' of github.com:damyon/moodle

commit 4e3f4bd9be99a28409e863793661aa904d986bb8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Jan 2013 08:02:34 +0800
Tag:    v2.3.5

Merge branch 'MDL-28512_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 4e63dc5e5dc94e095f5911b09e5666af09e3861c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Jan 2013 08:02:22 +0800
Tag:    v2.4.2

Merge branch 'MDL-28512_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit 29a4621e47dc8523620a9d70d4a34d988990c5d4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Jan 2013 08:02:12 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-28512' of git://github.com/timhunt/moodle

commit cf3e5c4965f72861097e40ad0c804bb48879354f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Jan 2013 07:52:53 +0800
Tag:    v2.4.2

Merge branch 'wip-mdl-37432-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE

commit 6501e6e0374a1cf036b023294dc1a5506f6934e0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Jan 2013 07:52:42 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-mdl-37432' of git://github.com/rajeshtaneja/moodle

commit 37027f431b306acfb8feac8f6c70af7aaa4ad373
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Jan 2013 06:26:35 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-29749-master-4th' of git://github.com/FMCorz/moodle

commit fa669c49adc1f342d804a39a811fc95795296d3b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Jan 2013 03:08:12 +0800
Tag:    v2.5.0-beta

Merge branch 'w03_MDL-36411_m25_setup' of git://github.com/skodak/moodle

commit 9d2f74684cd7a6d2af880e4a62aa4498cbf73623
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Jan 2013 03:01:56 +0800
Tag:    v2.3.5

Merge branch 'MDL-37577_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit be8bc2de5459994ada2fdcb8c267815c9891f080
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Jan 2013 03:01:46 +0800
Tag:    v2.4.2

Merge branch 'MDL-37577_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit ea4edbd6bcf376ce2e9aa295c656b5695ee1e27e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Jan 2013 03:01:39 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37577' of git://github.com/timhunt/moodle

commit ee7411c4b60fa6bf46d393a5055f5e09d547eae2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Jan 2013 02:44:27 +0800
Tag:    v2.3.5

Merge branch 'MDL-35924_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE

commit e081622b9b0d10aa138a71d91128a45d9c305aac
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Jan 2013 02:44:14 +0800
Tag:    v2.4.2

Merge branch 'MDL-35924_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE

commit 6ee4df92abb50af51614743ca6772c4d9a2ea605
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Jan 2013 02:41:45 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35924_master' of https://github.com/markn86/moodle

commit fd843c7f22d39f1ca9119f6157f8c604cdb1045a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 21 Jan 2013 23:47:45 +0800
Tag:    v2.3.5

Merge branch 'MDL-34050_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit ebe2f5a19c7616e85f73f9da2b266394c67df1e3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 21 Jan 2013 23:47:32 +0800
Tag:    v2.4.2

Merge branch 'MDL-34050_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE

commit 509c2758ceeac22144925a9036b2edde98bfe065
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 21 Jan 2013 23:47:18 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-34050' of git://github.com/rwijaya/moodle

commit 937ad8c62628321b3cb69782fcf88993ed49db82
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Jan 2013 03:52:47 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37555' of git://github.com/stronk7/moodle

commit 3431860f5476a536b23b311a909ceffad7f9566a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 09:27:48 +0800
Tag:    v2.5.0-beta

Merge branch 'w02_MDL-36988_m25_switchrole' of git://github.com/skodak/moodle

commit 0c198a1b59f604b925adbec9f52396cff66acab3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 09:22:26 +0800
Tag:    v2.5.0-beta

Merge branch 'w02_MDL-37429_m25_zippacker' of git://github.com/skodak/moodle

commit 06d78e820981f5e3754d4996cc000de1411fb47a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 09:05:27 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36257-master' of git://git.luns.net.uk/moodle

commit becb4de7074ec60d606fe8cfa5c033a574074419
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 08:58:08 +0800
Tag:    v2.5.0-beta

Merge branch 'w02_MDL-37019_m25_metadef' of git://github.com/skodak/moodle

commit 91d5e08aa3b4027577b12b31448743caeac6f61c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 08:28:53 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35775-master' of git://github.com/micaherne/moodle

commit a91350609eeefd05ea29a9c64cfc371e909a668d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 08:08:26 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-34344-m25' of git://github.com/samhemelryk/moodle

commit 7cf0504ac6e6a7af99002821f6d809f17901d175
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 04:56:49 +0800
Tag:    v2.3.5

Merge branch 'MDL-37173-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE

commit 6babcc30ad77eb03094f1e71bab703c5682f7087
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 04:56:40 +0800
Tag:    v2.4.2

Merge branch 'MDL-37173-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE

commit d9b9d22fa1ceb0daa4ea1a77e6a0e825133a44fa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 04:56:13 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37173-m' of git://github.com/andrewnicols/moodle

commit 5d112775e98fb3042d5ab544598d17d7e12bb2c1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 04:51:38 +0800
Tag:    v2.3.5

Merge branch 'MDL-37354-stable23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE

commit c7e4ebf3f3ae908361df9feb39b4ebd9cddc611a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 04:51:00 +0800
Tag:    v2.4.2

Merge branch 'MDL-37354-stable24' of git://github.com/mouneyrac/moodle into MOODLE_24_STABLE

commit 493d8f781c09230620374f6ea1d3e47baf68476d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 04:50:31 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37354-master' of git://github.com/mouneyrac/moodle

commit 563bcc2322f1fab40cdba0a629a04342f172fb64
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 04:44:38 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-31726' of git://github.com/colchambers/moodle

commit 5f2d7b30092b7480b097a3eafe4b3797a24701ff
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 03:16:29 +0800
Tag:    v2.3.5

Merge branch 'MDL-31616_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit ee5c647e84d11b75831596894cc7193e51d6e6d7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 03:14:03 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-31616' of git://github.com/timhunt/moodle

commit 09ebf8386a6238d7b36a0741556f56125768a469
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 03:06:26 +0800
Tag:    v2.3.5

Merge branch 'wip-mdl-37062-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit 38d2c7642d4f53572b30407e3779c7fe6ce0a7d1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 03:06:12 +0800
Tag:    v2.4.2

Merge branch 'wip-mdl-37062-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE

commit dcb21e6cc132b7f6da2aa223df03ed27bee53557
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 03:04:21 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-mdl-37062' of git://github.com/rajeshtaneja/moodle

commit 4090cd2b92958d0e79c89e9d17863fd5a09baf72
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 01:21:35 +0800
Tag:    v2.3.5

Merge branch 'MDL-34883_unit_tests_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit c1a8fb414eefb96e1d5f3a395489399551277beb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 01:21:27 +0800
Tag:    v2.4.2

Merge branch 'MDL-34883_unit_tests_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE

commit 0943a0ce1152973c2fef62b1c33d0d90d0c4fd47
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 01:21:12 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-34883_unit_tests' of git://github.com/andyjdavis/moodle

commit dc43bfe37232d32f6da464f89bba1c92f8ff6ce9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 01:17:33 +0800
Tag:    v2.3.5

Merge branch 'MDL-37395-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE

commit 0218dd4ccb8de301865192b127cc6fb0e6cf35a3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 01:17:24 +0800
Tag:    v2.4.2

Merge branch 'MDL-37395-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE

commit ceda80962ce8e262ba57dd1def76f953c005c1f0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 01:17:12 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37395-master' of git://github.com/sammarshallou/moodle

commit 62a96046777e9e4d09a859d4c68830239a5879aa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 01:12:20 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36553' of git://github.com/rwijaya/moodle

commit ada893d339cf6362ec9deb11eabb70248f5d0b13
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 01:02:26 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36554' of git://github.com/rwijaya/moodle

commit dfcb38a1c704ed81788958123c7fff36cca3813d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 01:00:17 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37207-master' of git://github.com/marinaglancy/moodle

commit 8784a3b2a2d1b638087b0f50b43ac13bb5915141
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 15 Jan 2013 07:16:34 +0800
Tag:    v2.3.5

Merge branch 'MDL-37431_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit c01b82d4e40f6d623b4cbacf93f84bad81e5bd90
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 15 Jan 2013 07:16:27 +0800
Tag:    v2.4.2

Merge branch 'MDL-37431_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit ca2dfd0070aab59e757b50dad61fa2cc0a9a4399
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 15 Jan 2013 07:16:18 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37431' of git://github.com/timhunt/moodle

commit eaa00a071ca6f2dd974c990072da1d4e8ff0ec59
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 15 Jan 2013 07:06:06 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37453-master' of git://github.com/marinaglancy/moodle

commit fe25b31d44e8ad3f2faaa8614d96712a44036479
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 15 Jan 2013 06:32:39 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37456' of git://github.com/danpoltawski/moodle

commit f38ac3510ad01d348552c79980f83d6dba3cdc09
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 15 Jan 2013 06:29:55 +0800
Tag:    v2.5.0-beta

Merge branch 'w02_MDL-37483_m25_redirect' of git://github.com/skodak/moodle

commit e3a2abd60f734bceda2645c3454c23ffc49e6f8a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 15 Jan 2013 06:22:13 +0800
Tag:    v2.2.8

Merge branch 'MDL-37485_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 1ed7c77347c77eef550e5f93e3a49d2b5e56b588
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 15 Jan 2013 06:22:03 +0800
Tag:    v2.3.5

Merge branch 'MDL-37485_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit bff4fc86e13f26727711b0a158fc6ff89ee25664
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 15 Jan 2013 06:21:53 +0800
Tag:    v2.4.2

Merge branch 'MDL-37485_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit b9bbc2a3567668fe3f14ade51096f410850569b7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 15 Jan 2013 06:21:38 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37485' of git://github.com/timhunt/moodle

commit 150c0b7e2c6ef8cd401a3a3837032e1da0623b84
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 Jan 2013 19:17:20 +0800
Tag:    v2.1.10

Merge branch 'install_21_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_21_STABLE

commit 696adcdc71521f79c0909e546270bb6b920a834c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 Jan 2013 19:17:06 +0800
Tag:    v2.2.7

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit 039cd4a52a3438a3f0e670c013fbdf553ca793c4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 Jan 2013 19:16:51 +0800
Tag:    v2.3.4

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit 72cece6ff438d2857c771bb91798926b00b0e295
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 Jan 2013 19:16:34 +0800
Tag:    v2.4.1

Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE

commit d0942f074450a6663a177c0d29bb9b5e9a3055c8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 Jan 2013 19:15:57 +0800
Tag:    v2.5.0-beta

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit 43bfcff941f6c25f014d5210482842538cef349a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 Jan 2013 01:20:48 +0800
Tag:    v2.4.1

Merge branch 'MDL-37467-blogs_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE

commit 72cb5eda5c156689ffcc8972f9294281d9d0f906
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 Jan 2013 01:13:27 +0800
Tag:    v2.3.4

Merge branch 'MDL-37467-blogs_23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE

commit b15e5d725258a11e9ba466ba6c903b5e8d853048
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 10 Jan 2013 18:14:07 +0800
Tag:    v2.3.4

Merge branch 'MDL-36741_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE

commit dc21606e4fedabbed5aa95d6be058a3c876ca1cd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 10 Jan 2013 18:13:57 +0800
Tag:    v2.2.7

Merge branch 'MDL-36741_m22' of git://github.com/markn86/moodle into MOODLE_22_STABLE

commit 72a504dc2ae3da6ff5a46f495d167ebe12d1091e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 10 Jan 2013 18:13:13 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36741_master' of git://github.com/markn86/moodle

commit 9d940d60967c12f0bde814ddc200277beab2c5ef
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Jan 2013 08:33:52 +0800
Tag:    v2.2.7

Merge branch 'w51_MDL-37420_m22_pgschema' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit cd7802517f65819a03381d5564a200d638ef8afb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Jan 2013 08:33:20 +0800
Tag:    v2.3.4

Merge branch 'w51_MDL-37420_m23_pgschema' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit b56324b8299c1137a01395bf7f8f337751678e29
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Jan 2013 08:32:33 +0800
Tag:    v2.4.1

Merge branch 'w51_MDL-37420_m24_pgschema' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit f9f750ceccb1ee73693ca4f4cee6ef50a93b3e14
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Jan 2013 08:32:09 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37420_m25_pgschema' of git://github.com/skodak/moodle

commit 8361f557a117211a21e657b8ad6b8bec402fbf69
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Jan 2013 08:31:50 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-31750-master' of git://github.com/abgreeve/moodle

commit e801c74c54ea1e836d8b236a79fe484c80e1af9b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Jan 2013 06:30:19 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37183_m25_excelcleanup' of git://github.com/skodak/moodle

commit c68f339e5ee4f071ccc5f10eb0a2534795c555b5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Jan 2013 06:25:34 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37203-m25' of git://github.com/samhemelryk/moodle

commit ac4c7aed68cbe70a53f3c865483548868ce6c82c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Jan 2013 06:11:54 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-35356_m25_excel' of git://github.com/skodak/moodle

commit a2eaf8896d33fda0488daef0821b45600449e921
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Jan 2013 01:02:51 +0800
Tag:    v2.3.4

Merge branch 'w51_MDL-37152_m23_smtp' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 844cb63fed1fce685f10edbd2233962943c1fdb9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Jan 2013 01:02:37 +0800
Tag:    v2.4.1

Merge branch 'w51_MDL-37152_m24_smtp' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 4f90540e0c5dde63a4f3eab9031f61b239d204ba
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Jan 2013 01:01:43 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37152_m25_smtp' of git://github.com/skodak/moodle

commit 65a550c484bcafad205001660d5c291098bed9a3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 08 Jan 2013 18:54:31 +0800
Tag:    v2.4.1

Merge branch 'MDL-37220_dnd_icon_24' of git://github.com/davosmith/moodle into MOODLE_24_STABLE

commit f9ba4fd83b98d32fae81d2c338f6063502e05285
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 08 Jan 2013 18:54:19 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37220_dnd_icon' of git://github.com/davosmith/moodle

commit a74c3851f7a9e0ebc779f7246569faaf7ad06551
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 08 Jan 2013 18:39:23 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37284_m25_mysqlutf8' of git://github.com/skodak/moodle

commit 783a51ba4822093b69a66ab9a728cd398cd1b4df
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 08 Jan 2013 17:51:49 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37291_m25_paypalrestore' of git://github.com/skodak/moodle

commit 0f83a143b0d93d7b6ce523fcbc8513a24d0449d1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 08 Jan 2013 17:34:15 +0800
Tag:    v2.4.1

Merge branch 'w51_MDL-37186_m24_tinymceconfig' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit cf78070a637cedf6a0166e73dbc7869c163565e5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 08 Jan 2013 17:34:04 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37186_m25_tinymceconfig' of git://github.com/skodak/moodle

commit 793c431543901c78914f5aae938230391fc47106
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 08 Jan 2013 17:22:15 +0800
Tag:    v2.4.1

Merge branch 'w51_MDL-37323_m24_dlgstrings' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit b315a452742e1623682237b1ae7e94062fa9a3e9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 08 Jan 2013 17:21:50 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37323_m25_dlgstrings' of git://github.com/skodak/moodle

commit 17e5c6e8d2abf6da3fbcd7a23f8ae4fe063d2460
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 08 Jan 2013 05:40:00 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35794' of git://github.com/timhunt/moodle

commit 5050a19ff7c36b1fc79b06a315b6f82a830e451e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 08 Jan 2013 05:38:48 +0800
Tag:    v2.3.4

Merge branch 'MDL-35794_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 0858993db8ea434a545c69c0d0173fd73506795e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 08 Jan 2013 05:36:29 +0800
Tag:    v2.3.4

Merge branch 'MDL-35792_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 3cb7609bd61ea8e47447dd5f7fbe7a0f7ece0b68
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 08 Jan 2013 05:35:06 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35792' of git://github.com/timhunt/moodle

commit f849d1f6fc557cfc5328adb8d77cb2873cd0a325
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 07 Jan 2013 18:44:54 +0800
Tag:    v2.4.1

Merge branch 'w51_MDL-36807_m24_mysocket' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit caf575e2bf657c73cdd20795d4ed2782787c6e5b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 07 Jan 2013 18:44:16 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-36807_m25_mysocket' of git://github.com/skodak/moodle

commit 356513cc805630b08b174226fb0ffa75e058ded2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sun, 30 Dec 2012 07:56:49 +0800
Tag:    v2.4.1

Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE

commit db6243d0a16ee97618cd611301d32576ddab5286
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 21 Dec 2012 03:57:56 +0800
Tag:    v2.1.10

Merge branch 'install_21_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_21_STABLE

commit e84b8c3f5c9a3f9ca3f5bbb470cdc038823a714a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 21 Dec 2012 03:57:28 +0800
Tag:    v2.3.4

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit ec39bd51dd7c1820daee82043c4b3da4d527cdd0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 21 Dec 2012 03:57:11 +0800
Tag:    v2.4.1

Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE

commit 29400ba5d657d66525e146e764efa29dce268a1e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 21 Dec 2012 03:56:58 +0800
Tag:    v2.5.0-beta

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit bbb750e1bab70d5790467a208f31fa0c7869f1ef
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 20 Dec 2012 17:41:55 +0800
Tag:    v2.4.1

Merge branch 'w50_MDL-37171_m24_outdatedexcel' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 92bdda9bd977754c07c9a4fcd6153f952db83bc5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 20 Dec 2012 17:22:46 +0800
Tag:    v2.5.0-beta

Merge branch 'w50_MDL-37171_m25_outdatedexcel' of git://github.com/skodak/moodle

commit 9af7c81879991d7f0372331a5ba6f82e0d2c6cd6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Dec 2012 06:43:06 +0800
Tag:    v2.3.4

Merge branch 'w50_MDL-36245_m23_convert' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit a8ccdd288082eb27ffcbc9037ff47c30f3a990c2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Dec 2012 06:42:53 +0800
Tag:    v2.4.1

Merge branch 'w50_MDL-36245_m24_convert' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 917169221f17f02fb68708cdbe48ce5b5f8a01d2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Dec 2012 06:41:48 +0800
Tag:    v2.5.0-beta

Merge branch 'w50_MDL-36245_m25_convert' of git://github.com/skodak/moodle

commit 421d18fd2e932cc6c1a1680a8cae3347cdb52e15
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Dec 2012 04:36:42 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-36339-master' of git://github.com/marinaglancy/moodle

commit af794e19f36feac863b721f7132ddb72e0bb9ebd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Dec 2012 07:19:55 +0800
Tag:    v2.3.4

Merge branch 'MDL-36842_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit cbef51f54bfcb7c39ee79226991ef4d0ef826751
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Dec 2012 07:17:51 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36842' of git://github.com/timhunt/moodle

commit 877960cfdf83338c02ef7f5a97e64903b45607cd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Dec 2012 07:14:04 +0800
Tag:    v2.3.4

Merge branch 'w50_MDL-37171_m23_outdatedexcel' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 1f60fe8a2335740118623b197a422510e55da624
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Dec 2012 07:13:55 +0800
Tag:    v2.4.1

Merge branch 'w50_MDL-37171_m24_outdatedexcel' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 7039c823dcebe77b1f63ef7431112c37ef62de66
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Dec 2012 07:13:45 +0800
Tag:    v2.5.0-beta

Merge branch 'w50_MDL-37171_m25_outdatedexcel' of git://github.com/skodak/moodle

commit 4e6157ca5f9c9201b5aea8ce31c1cb4de7744665
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 14 Dec 2012 20:20:49 +0800
Tag:    v2.3.4

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit ef3f003a76a5873085fc9691814466d70b8714ae
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 13 Dec 2012 17:32:50 +0800
Tag:    v2.2.7

Merge branch 'MDL-30700-22' of git://github.com/damyon/moodle into MOODLE_22_STABLE

commit 87e9ea1f675efc8f5def622c55f215f8addc538e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 13 Dec 2012 17:32:38 +0800
Tag:    v2.3.4

Merge branch 'MDL-30700-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

commit 04e56da75f96720513f0d363cc08f1438b2ec051
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 13 Dec 2012 17:31:59 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-30700-master' of git://github.com/damyon/moodle

commit 106c4841a71ab7d11d0795a0a0b0801b455bfb69
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 12 Dec 2012 05:50:08 +0800
Tag:    v2.3.4

Merge branch 'MDL-32880_23_3' of git://github.com/pauln/moodle into MOODLE_23_STABLE

commit 12e13ce047edf13bd470ae6cd0ae5922564b7c2a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 12 Dec 2012 05:48:06 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-32880_master_3' of git://github.com/pauln/moodle

commit 4ad65dc2b68a9b3342fce5d688f265ca70f30226
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 12 Dec 2012 05:42:09 +0800
Tag:    v2.5.0-beta

Merge branch 'm24_MDL-36641_Missing_external_package_HTTP_check' of https://github.com/scara/moodle

commit e6e5a4d219083f73d934efdebe82f5ab7d5dfecf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 12 Dec 2012 03:00:16 +0800
Tag:    v2.2.7

Merge branch 'MDL-30700-22' of git://github.com/damyon/moodle into MOODLE_22_STABLE

commit ecdee4a92535da5f94adab513bf7ea37e0bb6fd4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 12 Dec 2012 02:58:19 +0800
Tag:    v2.3.4

Merge branch 'MDL-30700-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

commit 771b82028500b2b2e5af1245acc684bee4dbe4c3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 12 Dec 2012 02:56:31 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-30700-master' of git://github.com/damyon/moodle

commit ac10ff24599c180bc7e31b571d82b2552e686597
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 08 Dec 2012 09:49:16 +0800
Tag:    v2.3.4

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit ee22329a9045106e3f5314127c465e8b3bef314f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 06 Dec 2012 09:24:47 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-36341-m24' of git://github.com/samhemelryk/moodle

commit b5cef3b9f565cd1f3d74b5bc701085d6907b6f26
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Dec 2012 06:24:56 +0800
Tag:    v2.3.4

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit b0d9ca18a47bf698a471f8c15e5d8f4ee238a6f5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Dec 2012 02:51:37 +0800
Tag:    v2.4.0

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit e9dab879b647fb034358948fe17cc9164ab692ad
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 03 Dec 2012 16:48:13 +0800
Tag:    v2.4.0

Merge branch 'MDL-36934-master' of git://git.luns.net.uk/moodle

commit 0139100af5db9bba42b25e2b7dfb1cbdb8cf23fa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 30 Nov 2012 19:48:29 +0800
Tag:    v2.3.4

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit 089b283b8a3ac9928256b2619282000372cd61cd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 30 Nov 2012 19:48:01 +0800
Tag:    v2.4.0-rc1

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit 155bd5d54a03d14df1b8ea769ef91cf5f4ad3022
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 26 Nov 2012 09:29:58 +0800
Tag:    v2.4.0-rc1

Merge branch 'wip-MDL-36819-m24-rb' of git://github.com/samhemelryk/moodle

commit f725158ea6398af77984fdae68f137b6df189869
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 26 Nov 2012 09:28:12 +0800
Tag:    v2.4.0-rc1

Merge branch 'wip-MDL-36768-m24-r2' of git://github.com/samhemelryk/moodle

commit d937f597e7dd908ded76a8a38caec821272a2488
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 21 Nov 2012 07:55:18 +0800
Tag:    v2.4.0-rc1

Merge branch 'w47_MDL-36719_m24_borkedcachingfront' of git://github.com/skodak/moodle

commit a9d6e9821126f79383a4801b8283c999822065b0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 20 Nov 2012 08:34:01 +0800
Tag:    v2.2.7

Merge branch 'MDL-36683_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit c7dcaf132484a8a4f949bb77044e156ecc242d6b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 20 Nov 2012 08:33:49 +0800
Tag:    v2.3.4

Merge branch 'MDL-36683_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 9e3f733f8ad559df7edd4eae8f6c6a435f8d52da
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 20 Nov 2012 08:33:39 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36683' of git://github.com/timhunt/moodle

commit 30b9d52d78f55dd37e3e3d535b459deed2e30da7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 10 Nov 2012 02:01:04 +0800
Tag:    v2.2.6

Merge branch 'MDL-25948_m22' of git://github.com/markn86/moodle into MOODLE_22_STABLE

commit 828bb475ac6451da9204e9e8d595a7802e255f7d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 10 Nov 2012 01:58:33 +0800
Tag:    v2.1.9

Merge branch 'MDL-25948_m21' of git://github.com/markn86/moodle into MOODLE_21_STABLE

commit cd59310d1b27765435cf71d0a54ff91e888e61f1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 06 Nov 2012 23:13:47 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35762_fix' of git://github.com/andyjdavis/moodle

commit f772bb2b97c308ebeddc7b60375ad9d51df8a5de
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 15 Oct 2012 06:08:04 +0800
Tag:    v2.1.9

Merge branch 'install_21_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_21_STABLE

commit f5916ab5af5987f9851ad6425fff21c7f8e74ceb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 15 Oct 2012 06:07:52 +0800
Tag:    v2.2.6

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit 92e9c3d09f1a2a1e36356d3da3c776601f9cdc2e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 15 Oct 2012 06:07:39 +0800
Tag:    v2.3.3

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit 535c3e874f38616dbbfccf66ecedaad1eb6ae1ed
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 15 Oct 2012 06:07:26 +0800
Tag:    v2.4.0-beta

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit 990853afbe5668b71e7c8b1f310a78920ea361e7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 15 Oct 2012 05:32:40 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-25290-m24-compact' of git://github.com/samhemelryk/moodle

commit f06b2de39ed21d5c1b14945ed3e981717661cf9a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 12 Oct 2012 08:18:31 +0800
Tag:    v2.2.6

Merge branch 'MDL-35858-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit f2c33d0b69a5d49781c0ce21fc4df98e8e2c362d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 12 Oct 2012 08:18:03 +0800
Tag:    v2.3.3

Merge branch 'MDL-35858-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 2105f57590ea6d069f0ab43997a41d74ecdb0f62
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 12 Oct 2012 08:15:34 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35858-master' of git://github.com/FMCorz/moodle

commit 5ba6db698d7f4ed6b587df5a32c4e243064fa4e3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Oct 2012 07:54:17 +0800
Tag:    v2.3.3

Merge branch 'MDL-35715-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE

commit 28990bbef4bba0c02bdcfd1351ea6a424a1a1797
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Oct 2012 07:48:53 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35715-master' of git://git.luns.net.uk/moodle

commit 566682e8e5495fb97fa9a27bb9d66c4d84e5d4a1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Oct 2012 17:22:22 +0800
Tag:    v2.4.0-beta

Merge branch 'w41_MDL-28980_m24_expirywarning' of git://github.com/skodak/moodle

commit 05c301a10980204c2b824f57783a59b97e615f30
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Oct 2012 16:58:22 +0800
Tag:    v2.4.0-beta

Merge branch 'w41_MDL-35691_m24_intsizes' of git://github.com/skodak/moodle

commit f6bfcaf6b3599e78b6ad3fc21bdd0c2bef8e9cd1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Oct 2012 15:57:00 +0800
Tag:    v2.4.0-beta

Merge branch 'master_MDL-34848' of git://github.com/danmarsden/moodle

commit be205a847a64021391cee1f696de3d8e591595ce
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Oct 2012 15:50:25 +0800
Tag:    v2.4.0-beta

Merge branch 'w41_MDL-28980_m24_expirywarning' of git://github.com/skodak/moodle

commit dbaf9d448d7a50eeb0463131ed2d4e06f0841224
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Oct 2012 06:35:11 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-22955-m24' of git://github.com/samhemelryk/moodle

commit 49b1c61e5edba7dcc79a1c1d37f6687a659c17f0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Oct 2012 06:22:11 +0800
Tag:    v2.4.0-beta

Merge branch 'w41_MDL-28980_m24_expirywarning' of git://github.com/skodak/moodle

commit 5553d3d60f786c70577cac0d9da82d669fcde9d3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 17:58:35 +0800
Tag:    v2.3.3

Merge branch 'w41_MDL-35898_m23_coursereset' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 02c4953ea5a93774930200c367d268500608d131
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 17:54:15 +0800
Tag:    v2.4.0-beta

Merge branch 'w41_MDL-35898_m24_coursereset' of git://github.com/skodak/moodle

commit aff7cb703a015b0dd7195d22efc442214d51afcd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 07:38:32 +0800
Tag:    v2.2.6

Merge branch 'wip-MDL-26348-m22' of git://github.com/samhemelryk/moodle into MOODLE_22_STABLE

commit f5ba035015d726a249c508bc5abe0d6ae5826dc9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 07:38:22 +0800
Tag:    v2.3.3

Merge branch 'wip-MDL-26348-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE

commit da6675d6330e401fbf1b77524b10b940a2c11f2f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 07:38:01 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-26348-m24' of git://github.com/samhemelryk/moodle

commit 5cb3d27681a279237820cc0c8b084c85a211cfb0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 06:47:11 +0800
Tag:    v2.3.3

Merge branch 'MDL-35141-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE

commit b9570857db345580fc7582802330a53326443c21
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 06:46:49 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35141-master' of git://github.com/sammarshallou/moodle

commit 827dd36f48daa4d10818622f2cdd4df9c674e45d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 06:40:26 +0800
Tag:    v2.2.6

Merge branch 'wip-mdl-35397-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 57ca2e437569d8e07e42bbb40d5dd948210f636a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 06:40:14 +0800
Tag:    v2.3.3

Merge branch 'wip-mdl-35397-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit 65095dad88423275492f6c85abccbfd0988addab
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 06:39:05 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-mdl-35397' of git://github.com/rajeshtaneja/moodle

commit f503a3cd5c1b339e9771b5316fb2cc4eda1087c7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 06:36:00 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35436' of https://github.com/raymondAntonio/moodle

commit ec467d04d92c59f444c80e63553c20d3cea47c37
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 06:31:08 +0800
Tag:    v2.4.0-beta

Merge branch 'w41_MDL-35645_m24_tinymcebuttons' of git://github.com/skodak/moodle

commit 2689298c8f2b4f31a32839da1439279456ba5b29
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 06:26:49 +0800
Tag:    v2.3.3

Merge branch 'MDL-35395_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 9f707d6c9b66ab4f1f2c8d9658352113a972e7e3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 06:25:53 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35395' of git://github.com/timhunt/moodle

commit 7447a1e55df3f19040df1585be651c6727aaa1bf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 06:13:06 +0800
Tag:    v2.4.0-beta

Merge branch 'wip_mdl-31968_mdl-23011_master' of https://github.com/iarenaza/moodle

commit 859d84062702d2acd4a9de66c5cce29da5137f87
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 06:08:26 +0800
Tag:    v2.3.3

Merge branch 'MDL-34794_M23' of git://github.com/raymondAntonio/moodle into MOODLE_23_STABLE

commit f064d2ef696be13d0e462c0803980316fc461f21
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 06:06:50 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34794' of git://github.com/raymondAntonio/moodle

commit 5d3559f7b59446fb5f47143baa188c62f3898b9b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 06:02:41 +0800
Tag:    v2.4.0-beta

Merge branch 'master_MDL-34848' of git://github.com/danmarsden/moodle

commit 1bffd70569976f45424b42fadf7931a130992596
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 05:57:31 +0800
Tag:    v2.2.6

Merge branch 'wip-mdl-35047-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 8b1cb823ded4d15bc69f60247a7a796bfc2219c9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 05:57:11 +0800
Tag:    v2.3.3

Merge branch 'wip-mdl-35047-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit 930ce3f3cdf95b77559e5662101ea0ad26c7fc18
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 05:56:53 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-mdl-35047' of git://github.com/rajeshtaneja/moodle

commit 3e0e4917d8c7647dd433bdf9ba8ac07519555821
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 05:54:51 +0800
Tag:    v2.3.3

Merge branch 'w41_MDL-35382_m23_reordertest' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 3b950bab64205500653fe47044ff6d16a44a388f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 05:54:36 +0800
Tag:    v2.4.0-beta

Merge branch 'w41_MDL-35382_m24_reordertest' of git://github.com/skodak/moodle

commit f374702e75b6caa0947be92c88bbb0d87a751384
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 05:51:26 +0800
Tag:    v2.4.0-beta

Merge branch 'w41_MDL-35691_m24_intsizes' of git://github.com/skodak/moodle

commit 7516f96676860e48fbf5c2233109ce704ab8e829
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 05:08:02 +0800
Tag:    v2.3.3

Merge branch 'MDL-35519_book_cancel_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit 0b85584480b6734051727cd5941ea170c5b95be3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 05:07:25 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35519_book_cancel' of git://github.com/andyjdavis/moodle

commit 85b1e9785777fb301e22676449dc837f968fd256
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 04:52:12 +0800
Tag:    v2.3.3

Merge branch 'w41_MDL-35714_m23_testgc' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 311eb89695b54b4c4c00ecfce8ffa9f7cf9a9d3c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 04:51:45 +0800
Tag:    v2.4.0-beta

Merge branch 'w41_MDL-35714_m24_testgc' of git://github.com/skodak/moodle

commit 7f13fc063c6156250ff76ef42772cf65788b9d99
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 05 Oct 2012 19:33:20 +0800
Tag:    v2.2.6

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit 035997329ae28551befd6b520ad1741d7444f0d7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 05 Oct 2012 19:33:02 +0800
Tag:    v2.3.3

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit 76fd95e687efdd5c775096b781dde57be2e2a4b5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 05 Oct 2012 19:32:46 +0800
Tag:    v2.4.0-beta

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit 7ba4b17f00ece70ae5308a9fc98e0ddec0e6ffed
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 05 Oct 2012 05:42:47 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34657_fixup' of git://github.com/timhunt/moodle

commit a8d7f5cf15a8c47ec904511a329d71ca813a663a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Oct 2012 06:40:35 +0800
Tag:    v2.3.3

Merge branch 'MDL-35744_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit b478f2ec1085de0e9beb7eb9d41794e3af75af59
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Oct 2012 06:40:10 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35744' of git://github.com/timhunt/moodle

commit db0ea4323d52690c198403ca3648807ed3ddd69a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Oct 2012 04:02:23 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35660' of git://github.com/netspotau/moodle-mod_assign

commit c740703c188b94afef1e66e37f51491aa9ac152b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Oct 2012 04:00:12 +0800
Tag:    v2.4.0-beta

Merge branch 'w40_MDL-31437_m24_cohortsync' of git://github.com/skodak/moodle

commit 9228a5d347eb5fdbd2713374137984e4f7cf79da
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Oct 2012 03:40:58 +0800
Tag:    v2.3.3

Merge branch 'm23_MDL-35227' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

commit 60e5d95a317b03cf20bedd1ad1676f2eb8c9f72c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Oct 2012 03:39:07 +0800
Tag:    v2.4.0-beta

Merge branch 'master_MDL-35227' of git://github.com/danmarsden/moodle

commit 5a2c3743265d7d19aba4b9e4c3a721c2aa23c28e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Oct 2012 03:27:55 +0800
Tag:    v2.4.0-beta

Merge branch 'w40_MDL-35701_m24_enroldb' of git://github.com/skodak/moodle

commit fc0f1c3cbca4598b6a49d7d81b6f609166dfae47
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Oct 2012 02:28:13 +0800
Tag:    v2.3.3

Merge branch 'm23_MDL-35557' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

commit f7a506fb87f4227047b99ab5fc5aba39e2807297
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Oct 2012 02:26:32 +0800
Tag:    v2.4.0-beta

Merge branch 'master_MDL-35557' of git://github.com/danmarsden/moodle

commit 0a7db801f35444dfa28afe185e2d3c7a6819dd53
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Oct 2012 21:59:09 +0800
Tag:    v2.3.3

Merge branch 'm23_MDL-35562' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

commit b94ffc6d8c22a1b7c4a6795df7ff75df4f42c713
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Oct 2012 21:54:32 +0800
Tag:    v2.4.0-beta

Merge branch 'master_MDL-35562' of git://github.com/danmarsden/moodle

commit 2aeb0fbb600be9ebdce23cdb5cd20d8a4b58497b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Oct 2012 15:55:20 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35673-master' of git://git.luns.net.uk/moodle

commit 1203b6ea052d96941f18abd55d36642efa96d51c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Oct 2012 05:44:07 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35669-master-2' of git://github.com/micaherne/moodle

commit 8614cd72f04c7f5ca022ad3d7e3c8a395024c95c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Oct 2012 05:22:39 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34657' of git://github.com/timhunt/moodle

commit 1950fefc9987211deb9eb62c9f6083efa1546a45
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 01 Oct 2012 19:37:26 +0800
Tag:    v2.2.6

Merge branch 'MDL-34931-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 50e8e4d00b5d1a930194df6678c115eb0cd58b14
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 01 Oct 2012 19:37:12 +0800
Tag:    v2.3.3

Merge branch 'MDL-34931-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 5522e44658372251fbf83c4f4b03a49fe77e5675
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 01 Oct 2012 19:32:44 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34931-master' of git://github.com/FMCorz/moodle

commit ab6a0f497b7f73e7cbddb93ad31c919539ffb8d3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 01 Oct 2012 19:19:35 +0800
Tag:    v2.2.6

Merge branch 'MDL-35637_m22' of git://github.com/markn86/moodle into MOODLE_22_STABLE

commit aa63be7f5f4bef66f7c1f972007ef5c3e4ba40ea
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 01 Oct 2012 19:19:22 +0800
Tag:    v2.3.3

Merge branch 'MDL-35637_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE

commit a5fc5b6cebbff3d07fff6b509a4243b70260a5c0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 01 Oct 2012 19:19:01 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35637_master' of git://github.com/markn86/moodle

commit a499689c8b377c1b729cda92c4f90797de0b1b80
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 01 Oct 2012 19:14:43 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35662' of git://github.com/netspotau/moodle-mod_assign

commit 4df574f9e545849df20fc3aa61ba17f5e0c1112f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 01 Oct 2012 19:10:06 +0800
Tag:    v2.3.3

Merge branch 'wip-MDL-34234-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE

commit a88258ac9f8f2a6a016cd2a22fbfef6eafd3a35a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 01 Oct 2012 19:09:44 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-34234-m24' of git://github.com/samhemelryk/moodle

commit c3f06aacef38236d532ffb4c0e58b8a99d38f55e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 01 Oct 2012 18:48:48 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34971-wip' of git://github.com/mouneyrac/moodle

commit de165bab23e1cf9187696bec8cda9a3b82e0a4f5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 01 Oct 2012 18:46:41 +0800
Tag:    v2.2.6

Merge branch 'MDL-35644-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit 198178ff2a64ae8d5f1cced37f99c4b632f3b756
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 01 Oct 2012 18:46:26 +0800
Tag:    v2.3.3

Merge branch 'MDL-35644-MOODLE_23_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE

commit b69927877349a9cde508e6b2a3c9835b8612287d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 01 Oct 2012 18:45:51 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35644' of git://github.com/mouneyrac/moodle

commit 35e19e2acd8b241bf39d4fac8162144333e6599c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 01 Oct 2012 17:08:14 +0800
Tag:    v2.3.3

Merge branch 'MDL-34894_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 9a6f1154c278ea3f09168f875bfe45c4d65ffe7b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 01 Oct 2012 17:07:47 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34894' of git://github.com/timhunt/moodle

commit 5ab457bde0b73f54f8dd7d12ddb9bce88755f921
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 01 Oct 2012 16:40:09 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35688' of git://github.com/netspotau/moodle-mod_assign

commit fc561b20896100b2b3da2bfac5c68e8829b9df0c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 01 Oct 2012 16:28:28 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35620' of git://github.com/timhunt/moodle

commit 695dee4bcdcad81ad615b79931226e1ed2ab12ca
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 27 Sep 2012 06:35:34 +0800
Tag:    v2.4.0-beta

Merge branch 'WIP-MDL-35564' of git://github.com/nadavkav/moodle

commit ba6d56c202ad55c6eb1600203540fb6c1d631789
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 27 Sep 2012 06:06:17 +0800
Tag:    v2.4.0-beta

Merge branch 'WIP-MDL-35481' of git://github.com/nadavkav/moodle

commit 21ba954e99abcc3669ae4874ef86260e4ada3412
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 27 Sep 2012 05:50:41 +0800
Tag:    v2.4.0-beta

Merge branch 'WIP-MDL-35246' of git://github.com/nadavkav/moodle

commit d863a99aeecef7608ba156f858d2b8398f63f5dd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 27 Sep 2012 03:48:27 +0800
Tag:    v2.4.0-beta

Merge branch 'WIP-MDL-35527' of git://github.com/nadavkav/moodle

commit d4cfaaf9a9f9fb066348b8a579b67e5fd00a4cc4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 27 Sep 2012 01:35:11 +0800
Tag:    v2.4.0-beta

Merge branch 'WIP-MDL-35578' of git://github.com/nadavkav/moodle

commit b20e4c11e29834f66ccd097266242af594973924
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 26 Sep 2012 18:17:23 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34573_accessibility' of git://github.com/rwijaya/moodle

commit e045b426212f16e94b598967a5c649fe0f19f06d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Sep 2012 07:16:35 +0800
Tag:    v2.4.0-beta

Merge branch 'WIP-MDL-35576' of git://github.com/nadavkav/moodle

commit 81feb36bf2ecdc8b40b10cd1c4a751d9181371a0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Sep 2012 06:35:19 +0800
Tag:    v2.4.0-beta

Merge branch 'WIP-MDL-35537' of git://github.com/nadavkav/moodle

commit ede30adcf992ba60bbefd4c821e70bb1b1a714d7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Sep 2012 06:07:35 +0800
Tag:    v2.4.0-beta

Merge branch 'w39_MDL-35515_m24_yui371' of git://github.com/skodak/moodle

commit dafc3b7a85a49eca5dd936354f320e8c642f1bd6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Sep 2012 17:33:24 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-8307-master' of git://github.com/FMCorz/moodle

commit 8e35be43c44f4edb9959e7e60bbff49e157ce385
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Sep 2012 17:06:33 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35226-master' of git://github.com/ankitagarwal/moodle

commit c43fe7f71e58399cf00f16607f46b2ffee050572
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Sep 2012 06:39:26 +0800
Tag:    v2.2.6

Merge branch 'wip-mdl-33166-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit e6084683c8b7ef6fe215a3950c9b618b071a67ad
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Sep 2012 06:39:08 +0800
Tag:    v2.3.3

Merge branch 'wip-mdl-33166-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit a9c31deea86530bc803a23dd7a0702b05ee8bb32
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Sep 2012 06:38:41 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-mdl-33166' of git://github.com/rajeshtaneja/moodle

commit 1f8ee5ce2266603f913cad9de214d8d52404e627
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Sep 2012 02:10:46 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35226-master' of git://github.com/ankitagarwal/moodle

commit b437a680d2dc609b9940912ffcd6d250699f0804
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Sep 2012 02:06:03 +0800
Tag:    v2.3.3

Merge branch 'MDL-33198-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit 05b7836ff7ba1647b1ef1d3381d7d9ef861d425d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Sep 2012 02:04:58 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33198-master' of git://github.com/ankitagarwal/moodle

commit 631aedabb4f1e656ac401a5fa1f8bc45deb3a297
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Sep 2012 01:51:38 +0800
Tag:    v2.3.3

Merge branch 'w38_MDL-32572_m23_authdbduplicates' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 543951c574e6d852441c8af9481d8feaa1decc15
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Sep 2012 01:51:24 +0800
Tag:    v2.4.0-beta

Merge branch 'w38_MDL-32572_m24_authdbduplicates' of git://github.com/skodak/moodle

commit 58e4214b9592b09f6b42e247d37e61508057dbae
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Sep 2012 01:20:05 +0800
Tag:    v2.4.0-beta

Merge branch 'w38_MDL-35331_m24_verboseenroldb' of git://github.com/skodak/moodle

commit 5fe658fca987573d0e8cd494f34e2e6063317d64
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Sep 2012 00:57:39 +0800
Tag:    v2.4.0-beta

Merge branch 'w38_MDL-35062_m24_selfaction' of git://github.com/skodak/moodle

commit 8f75ffeba1c74c0448f608fd183352ae03c6387d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Sep 2012 23:41:49 +0800
Tag:    v2.4.0-beta

Merge branch 'w38_MDL-35063_m24_manualaction' of git://github.com/skodak/moodle

commit 5ceded28695ddad647885545f936d7dcf21530b8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Sep 2012 22:55:42 +0800
Tag:    v2.4.0-beta

Merge branch 'w38_MDL-35465_m24_cohortscleanup' of git://github.com/skodak/moodle

commit 6dc9b1569d46a52357337c5d8b1a5816e270f51c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Sep 2012 07:59:28 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35153-master' of https://github.com/mackensen/moodle

commit a6e1cc12c82ded32fd12cb14eaf1d82fe2fd622a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Sep 2012 07:54:00 +0800
Tag:    v2.2.6

Merge branch 'MDL-32688-m22' of git://github.com/itamart/moodle into MOODLE_22_STABLE

commit 0671db29cec89fb4ecd4763699185d577e42f250
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Sep 2012 07:53:50 +0800
Tag:    v2.3.3

Merge branch 'MDL-32688-m23' of git://github.com/itamart/moodle into MOODLE_23_STABLE

commit f3d81719b0c56d93e3f33a0585fa1dca06f560e3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Sep 2012 07:53:15 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-32688' of git://github.com/itamart/moodle

commit 3b4f791ba0f07f822983989194e57df66ec4225c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Sep 2012 07:30:45 +0800
Tag:    v2.2.6

Merge branch 'MDL-35419_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit c59d51b67dab288a52ddf623dbdfc8ebd944be51
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Sep 2012 07:28:46 +0800
Tag:    v2.3.3

Merge branch 'MDL-35419_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 9577f6ee94dd38ad7b0d0380042ca378754f3dbf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Sep 2012 07:28:34 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35419' of git://github.com/timhunt/moodle

commit b050380df144673ff3ceb514844618182d4a3c34
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Sep 2012 07:20:45 +0800
Tag:    v2.3.3

Merge branch 'MDL-32230-23' of https://github.com/mackensen/moodle into MOODLE_23_STABLE

commit 53b1a1ecb21ae7a94990f0243cfceefdd6d2c871
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Sep 2012 07:16:15 +0800
Tag:    v2.2.6

Merge branch 'MDL-34841_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 0f5c4b83976a51176a37743ba83757eb27963e34
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Sep 2012 07:15:31 +0800
Tag:    v2.3.3

Merge branch 'MDL-34841_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit b18816beaeed4123c990fbc8ee6c06063f5abff0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Sep 2012 07:15:14 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34841' of git://github.com/timhunt/moodle

commit a0a02f4e0d887ac7c0f38aa3d4dabf353af41bad
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Sep 2012 07:12:34 +0800
Tag:    v2.3.3

Merge branch 'w38_MDL-35129_m23_dbmigration' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 742b6984fccd6953b2b5b6098a9231e1f3f5e8f8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Sep 2012 07:12:17 +0800
Tag:    v2.4.0-beta

Merge branch 'w38_MDL-35129_m24_dbmigration' of git://github.com/skodak/moodle

commit 5df0b2580607987dcb7af2f220bcc7fdb2655ed1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Sep 2012 00:02:46 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35344-updates' of git://github.com/mudrd8mz/moodle

commit 62a22d5b9a77c65a103e449e261e9295a26905bb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 15 Sep 2012 01:03:37 +0800
Tag:    v2.2.6

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit b5b8aac98aaa41004eaf422edddfbd9b9d654fd4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 15 Sep 2012 01:03:20 +0800
Tag:    v2.3.3

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit 0a0e7da565b6470414e2e276dcd2e3d877a6d3b2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 15 Sep 2012 01:03:06 +0800
Tag:    v2.4.0-beta

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit b01c955fef1d2f9b930cffdb84bbb006d1fe0686
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 14 Sep 2012 07:19:50 +0800
Tag:    v2.4.0-beta

Merge branch 'w37_MDL-27856_m24_cohortrestore' of git://github.com/skodak/moodle

commit 2bc620b36325a06bdf563ce5304a9eccc12d5c04
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 14 Sep 2012 07:08:49 +0800
Tag:    v2.4.0-beta

Merge branch 'w37_MDL-35071_m24_enrolrestore' of git://github.com/skodak/moodle

commit bd390545b12602b8c5300be0d5476a08fc996aa0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 12 Sep 2012 23:20:48 +0800
Tag:    v2.3.3

Merge branch 'MDL-34082_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 7ec68510d903489c69f0b6edc775d99f0d68837d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 12 Sep 2012 23:19:17 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34082' of git://github.com/timhunt/moodle

commit 7f34030583c271814951d7d75d78f84b0dacd202
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 12 Sep 2012 18:17:04 +0800
Tag:    v2.4.0-beta

Merge branch 'master_MDL-33755' of git://github.com/danmarsden/moodle

commit ae066a46919fbfb6f4a79ce7b74ff3edeace876b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 12 Sep 2012 03:33:06 +0800
Tag:    v2.4.0-beta

Merge branch 'master_MDL-34544' of git://github.com/danmarsden/moodle

commit 6e52a71bee46b3e5e0c103bf55dd9d7866055fb3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 12 Sep 2012 00:53:35 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34962' of git://github.com/Lightwork-Marking/moodle

commit 63c4c85effabc3f0200493f5891c2a01ed64e93c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 22:30:58 +0800
Tag:    v2.2.6

Merge branch 'MDL-34984_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit 65888869651166d5c3b5a56a60a3153585f7a05b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 22:30:44 +0800
Tag:    v2.3.3

Merge branch 'MDL-34984_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit e633ea6b46f30105bee9b6330f415d294f27aed9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 22:28:46 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34984' of git://github.com/rwijaya/moodle

commit e813835f5cea86ba8ee775036177ccd477054fa9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 08:50:56 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35134_master' of git://github.com/pauln/moodle

commit 11a3dd0c0ea58edeed3a1c127c7c6de3e2beaea9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 08:50:29 +0800
Tag:    v2.3.3

Merge branch 'MDL-35134_23' of git://github.com/pauln/moodle into MOODLE_23_STABLE

commit a59f0f25cdfb4e6215a5395764d326fdc2dd0da4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 08:48:22 +0800
Tag:    v2.3.3

Merge branch 'm23_MDL-35156' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

commit 2b9782fdd012ff2e2b70c9a421eff653835884fa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 08:45:08 +0800
Tag:    v2.2.6

Merge branch 'MDL-35171_m22' of git://github.com/merrill-oakland/moodle into MOODLE_22_STABLE

commit 35eb1a0f0cd0161a517734d0b1fe45b621db2312
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 08:44:56 +0800
Tag:    v2.3.3

Merge branch 'MDL-35171_m23' of git://github.com/merrill-oakland/moodle into MOODLE_23_STABLE

commit c0d716d7b9aab8ee46a1777bde84374a955eae88
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 08:44:30 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35171' of git://github.com/merrill-oakland/moodle

commit 0f43c243859fc8a465d859fe66be39f1cd77d820
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 08:23:16 +0800
Tag:    v2.2.6

Merge branch 'MDL-29348-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 2e4678332ac64587a5baf3b236e0802582382d6e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 08:19:48 +0800
Tag:    v2.3.3

Merge branch 'wip-MDL-34338-MOODLE_23_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_23_STABLE

commit caaf32f823564b0261d9a794f2e453d534052c5a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 08:17:30 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-34338-master' of git://github.com/marinaglancy/moodle

commit 29636a9af20de96859284d8fed9ebfbcb03011f3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 08:08:41 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34660' of git://github.com/raymondAntonio/moodle

commit 686723f4fa53c37b4c49b66e2a38eb1ff5bec080
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 08:03:24 +0800
Tag:    v2.2.6

Merge branch 'm22_MDL-35123' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit c0eee4898a5d7364ec4aec9f19cfbe8a5a146400
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 08:03:10 +0800
Tag:    v2.3.3

Merge branch 'm23_MDL-35123' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

commit 50dca95dc4f72a228744224b1e7213711bdaa5a9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 08:02:49 +0800
Tag:    v2.4.0-beta

Merge branch 'master_MDL-35123' of git://github.com/danmarsden/moodle

commit 5f48905520d597b3dd9dd3c681aed9d235ff364f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 07:57:53 +0800
Tag:    v2.2.6

Merge branch 'm22_MDL-35208' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit 3a3120e2067a765305a6d90103e64170c3e06455
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 07:57:21 +0800
Tag:    v2.3.3

Merge branch 'm23_MDL-35208' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

commit 227b50eb43b287b412c5168d07ec532c0d5ff965
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 07:56:51 +0800
Tag:    v2.4.0-beta

Merge branch 'master_MDL-35208' of git://github.com/danmarsden/moodle

commit 86e2c5912851910e6fe0e58ccae72bec91cae35e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 07:53:48 +0800
Tag:    v2.2.6

Merge branch 'MDL-35257-22' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit f34cb5797ced98250a499e41ec454104d040073f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 07:53:35 +0800
Tag:    v2.3.3

Merge branch 'MDL-35257' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit 513480c22a54fa5be2acfd4c494fa81710bed091
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 07:53:17 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35257-master' of git://github.com/danpoltawski/moodle

commit 8146d3f12dd5906c9bdfce58600539abfd02bb18
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 07:48:55 +0800
Tag:    v2.3.3

Merge branch 'w37_MDL-35270_m23_oracohort' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 70a491c20e37696a7be5a3245a9ae8e69da62d2c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 07:48:34 +0800
Tag:    v2.4.0-beta

Merge branch 'w37_MDL-35270_m24_oracohort' of git://github.com/skodak/moodle

commit 24543a21450768d5ab707a705aaea85eed8b421f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 07:03:06 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35272-typo' of git://github.com/mudrd8mz/moodle

commit 1f4cd1fcec14439d114089f8b96fe3ed95df08e1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 05:45:47 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35301-master' of git://github.com/FMCorz/moodle

commit 5e51915c8051947431cb3ae57b3c3e6f1a4fb942
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 05:35:12 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-8307-master' of git://github.com/FMCorz/moodle

commit 2c248bd416e28361b6f56bb7803b86753fef76f4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 04:13:36 +0800
Tag:    v2.4.0-beta

Merge branch 'w37_MDL-35284_m24_borkedtoolbar' of git://github.com/skodak/moodle

commit a8cdd8758bc3d16a4944353d0858545e16789a72
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 02:39:19 +0800
Tag:    v2.4.0-beta

Merge branch 'w37_MDL-35318_m24_stringrevisions' of git://github.com/skodak/moodle

commit 4eca916b5ffa5260a5d1475ea8b0de8e9ed8a9fb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 01:53:54 +0800
Tag:    v2.2.6

Merge branch 'w37_MDL-35289_m22_tinymcelangs' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit ab88177b5e0d7e8eba3836a8f3222a34f351761e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 01:53:24 +0800
Tag:    v2.3.3

Merge branch 'w37_MDL-35289_m23_tinymcelangs' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit e79802e04eb6172546648276422a0dd6ad30ed2f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 10 Sep 2012 22:54:43 +0800
Tag:    v2.4.0-beta

Merge branch 'w37_MDL-35289_m24_tinymcelangs' of git://github.com/skodak/moodle

commit 694c861e812523504d3c5d46ed7ddc2cf5522905
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 10 Sep 2012 22:42:09 +0800
Tag:    v2.2.6

Merge branch 'MDL-35343_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit f58585807cfd35076bed05bfa24f8a53408c03c3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 10 Sep 2012 22:41:56 +0800
Tag:    v2.3.3

Merge branch 'MDL-35343_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 979b868cf17c46f0a8a1a92f6b2295ab6530743d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 10 Sep 2012 22:41:25 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35343' of git://github.com/timhunt/moodle

commit 2376d7125b891df4d3dfcbec9f130aabdb17f396
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 07 Sep 2012 08:18:30 +0800
Tag:    v2.2.5

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit 662fe4b7d6fbea1a0aa04fb1218b0c235319d112
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 07 Sep 2012 08:18:16 +0800
Tag:    v2.3.2

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit 9411c595e04e261a23f4c26867c9f9756b73d134
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 07 Sep 2012 08:17:55 +0800
Tag:    v2.4.0-beta

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit 09cca2d7aad63aa2256399c36dd20c8d49f7c692
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 07 Sep 2012 02:12:22 +0800
Tag:    v2.2.5

Merge branch 'MDL-34945-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit ce077202d081ffae2d7e9d43dd55d84d513919cc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 07 Sep 2012 02:12:09 +0800
Tag:    v2.3.2

Merge branch 'MDL-34945-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 92b75df8041d7b5770c60eec98df6a92338751e0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 07 Sep 2012 02:11:53 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34945-master' of git://github.com/FMCorz/moodle

commit e7920065ac8a3d23657646b8e93ca9781acd527a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 07 Sep 2012 02:08:05 +0800
Tag:    v2.2.5

Merge branch 'MDL-34985_m22' of git://github.com/merrill-oakland/moodle into MOODLE_22_STABLE

commit d98c8fcb8ebb218ed07c3e10ce5fd4aa40b38574
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 07 Sep 2012 02:07:45 +0800
Tag:    v2.3.2

Merge branch 'MDL-34985_m23' of git://github.com/merrill-oakland/moodle into MOODLE_23_STABLE

commit 34a52050b23047fe75aadebb712ce12db40d4308
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 07 Sep 2012 02:06:30 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34985' of git://github.com/merrill-oakland/moodle

commit 7c2bc95ae2431b4c2215d8523a9e46d24f38c698
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 07 Sep 2012 01:31:43 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-6424-master' of git://github.com/abgreeve/moodle

commit 0cbf023ab6eb77f9c838075fcfddb83b2bd9df45
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 06 Sep 2012 18:08:26 +0800
Tag:    v2.4.0-beta

Merge branch 'w36_MDL-35172_m24_editortoolbar' of git://github.com/skodak/moodle

commit 0e08f394f5843da1cb29fe97f4165205299a2f6b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 06 Sep 2012 08:01:11 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35034-master' of git://github.com/FMCorz/moodle

commit 37a74d1e2867710f4a32061a08d0223a23efa1a8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 06 Sep 2012 07:29:04 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-27799' of git://github.com/timhunt/moodle

commit 222abcddd4c9e346241b5dfa6fd706a942653ea5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 06 Sep 2012 07:18:54 +0800
Tag:    v2.2.5

Merge branch 'MDL-35034-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit e02955dd7926765d19d7535ee2ff7f6d5218cc3f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 06 Sep 2012 07:18:40 +0800
Tag:    v2.3.2

Merge branch 'MDL-35034-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit da91c22212746d4bccf17b66d0de616bb867aa12
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Sep 2012 19:13:53 +0800
Tag:    v2.2.5

Merge branch 'w36_MDL-35077_m22_stats' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 9569ba7ed8f839c7d94f80a371cc2fd280c5d674
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Sep 2012 19:13:31 +0800
Tag:    v2.3.2

Merge branch 'w36_MDL-35077_m23_stats' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 130eddd24cdc8adb66817ab5574c7ff15d560a03
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Sep 2012 19:12:59 +0800
Tag:    v2.4.0-beta

Merge branch 'w36_MDL-35077_m24_stats' of git://github.com/skodak/moodle

commit d84df9f5a6a3e38eba6971f0fc796ea38bc2ccac
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Sep 2012 06:53:50 +0800
Tag:    v2.2.5

Merge branch 'MDL-34997-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 3ac8fa663ad84d9b758b9d53b4d74f37170ebe29
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Sep 2012 06:52:43 +0800
Tag:    v2.3.2

Merge branch 'MDL-34997-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 4bab07c68c68cbf0bfdcd36753e90db30b45fbaf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Sep 2012 06:52:17 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34997-master' of git://github.com/FMCorz/moodle

commit e20371b31669d46d18dd2b6ed71a376c2438cde8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 08:09:37 +0800
Tag:    v2.2.5

Merge branch 'wip-mdl-34606-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 31ae0e5984353974583c6c718d37e73e7e64d644
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 08:09:25 +0800
Tag:    v2.3.2

Merge branch 'wip-mdl-34606-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit 519fb0b878442d94ba9a7900d290c2f68e979652
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 08:08:54 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-mdl-34606' of git://github.com/rajeshtaneja/moodle

commit 81baf0d5f30f9b22ee68f41c96f4d1790bb7ee43
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 07:54:23 +0800
Tag:    v2.2.5

Merge branch 'MDL-34633-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 3dafe46b2b9685f14e67046810531ed459b692e8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 07:54:04 +0800
Tag:    v2.3.2

Merge branch 'MDL-34633-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 12e0ecde48f67e10d693a3755447887fa22a4694
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 07:52:08 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34633-master' of git://github.com/FMCorz/moodle

commit 7ef0d527b23996d7e69be8aa20453f30f1a640aa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 07:20:55 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-31295-POST23' of git://github.com/netspotau/moodle-mod_assign

commit befce5863d508fbc75684ec19ce850803c0a99a8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 07:14:33 +0800
Tag:    v2.2.5

Merge branch 'MDL-29662_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 5f015b62d455d4937e0679af981c7e253f9958c9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 07:14:18 +0800
Tag:    v2.3.2

Merge branch 'MDL-29662_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit b448cf475e3fa40066057e80a08c4a3b5eaeb0a1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 07:14:06 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-29662' of git://github.com/timhunt/moodle

commit 948835483a2258941d2d6654a0dd00f826aa98ea
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 07:08:07 +0800
Tag:    v2.2.5

Merge branch 'MDL-27818_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 2b567e3687f63f15d9f696d5624d61cce3df268f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 07:07:51 +0800
Tag:    v2.3.2

Merge branch 'MDL-27818_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 5087a95e9cd2af695949be86d1509a489831a1a1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 07:06:48 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-27818' of git://github.com/timhunt/moodle

commit 5b38b6be70c0554d1102059a773348ace9801965
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 06:38:30 +0800
Tag:    v2.4.0-beta

Merge branch 'w36_MDL-35189_m24_typo3' of git://github.com/skodak/moodle

commit 8619c884d90a2464b72581f207e8b433b382e6d9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 06:35:48 +0800
Tag:    v2.4.0-beta

Merge branch 'w36_MDL-35185_m24_flowplayer' of git://github.com/skodak/moodle

commit 3db989d41ea6949559bb079088e696dcfc787896
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 06:31:23 +0800
Tag:    v2.2.5

Merge branch 'MDL-33306_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 8a716e23628fe3a70d214c046345434d4bc7d229
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 06:30:59 +0800
Tag:    v2.3.2

Merge branch 'MDL-33306_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit a39c97ca4a9a5f1bec7e77fa74cef3262eb601c2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 06:30:35 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33306' of git://github.com/timhunt/moodle

commit 81f6a19377fef11efa437da7f1d3af011ffc5271
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 06:20:38 +0800
Tag:    v2.2.5

Merge branch 'MDL-33812-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 20182f867037608bd44d64714e6198b2b0669913
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 06:20:17 +0800
Tag:    v2.3.2

Merge branch 'MDL-33812-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit edeb39d44af84669813eee73b71a6aa94b548c71
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 06:19:53 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33812-master' of git://github.com/FMCorz/moodle

commit 99e6bd47993ebef9f34970e206c156af164d73ff
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 06:06:23 +0800
Tag:    v2.3.2

Merge branch 'MDL-34725-strict-standards_23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE

commit bf14738ea1043bccf793882e6407af3e81457f93
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 06:05:52 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34725-strict-standards' of git://github.com/mudrd8mz/moodle

commit 91f65d0ab4142b62474eebe0f13377b125c5ed14
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 06:02:01 +0800
Tag:    v2.2.5

Merge branch 'w36_MDL-34097_m22_environment' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 0af2fd2e05a7d0005025a2cd9b8060961d1ab63d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 06:00:38 +0800
Tag:    v2.3.2

Merge branch 'w36_MDL-34097_m23_environment' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 717282a5da96df5dcd655a8d3b33756a41508007
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 06:00:20 +0800
Tag:    v2.4.0-beta

Merge branch 'w36_MDL-34097_m24_environment' of git://github.com/skodak/moodle

commit 4ee9de8f8f9d54419a3b140d6ad2fecaaee3fd3e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 05:42:14 +0800
Tag:    v2.4.0-beta

Merge branch 'w36_MDL-35188_m24_tcpdf' of git://github.com/skodak/moodle

commit ffa9378541a51ce0cc5d2a53594b1b335a992d8d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 05:31:13 +0800
Tag:    v2.4.0-beta

Merge branch 'w36_MDL-35186_m24_phpmailer' of git://github.com/skodak/moodle

commit e246a8056e9d5fc41d41cc2a8d79ade03963813e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 02:16:20 +0800
Tag:    v2.4.0-beta

Merge branch 'w36_MDL-35184_m24_adodb' of git://github.com/skodak/moodle

commit 7b3a9020e62145305c74518e4f52a16955dad2ae
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 02:02:33 +0800
Tag:    v2.2.5

Merge branch 'MDL-28346-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 2cdf1a465045ff756b930a493cad2c20fef478b1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 02:02:13 +0800
Tag:    v2.3.2

Merge branch 'MDL-28346-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 8f487cb60855ec31fbb71bc6cc9662ad495ce125
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 01:30:21 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-28346-master' of git://github.com/FMCorz/moodle

commit 06d5f84d71b9835ca6dbca735179539f40d8697f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 03 Sep 2012 23:54:45 +0800
Tag:    v2.2.5

Merge branch 'w36_MDL-35077_m22_stats' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 0cae56b42eb816ac29008f2ccf26ed686a9550b4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 03 Sep 2012 23:54:03 +0800
Tag:    v2.3.2

Merge branch 'w36_MDL-35077_m23_stats' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 66ea24cf70f2057b94d441d50bb33005734e3173
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 03 Sep 2012 23:53:34 +0800
Tag:    v2.4.0-beta

Merge branch 'w36_MDL-35077_m24_stats' of git://github.com/skodak/moodle

commit 8918cf7b0d94584d6596f5849f43c677e7aaa2c5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 03 Sep 2012 23:48:12 +0800
Tag:    v2.2.5

Merge branch 'MDL-35133_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit b9d24254bd12d8d57f92edfd094a1ec698cb3dd0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 03 Sep 2012 23:47:50 +0800
Tag:    v2.3.2

Merge branch 'MDL-35133_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 1cdcfb78133ee1933c4a5dd0ae1d670b61761eb5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 03 Sep 2012 23:47:33 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35133' of git://github.com/timhunt/moodle

commit a31d7a0ed3066dd52e9aa59d4669a8712f30b407
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 03 Sep 2012 23:16:17 +0800
Tag:    v2.3.2

Merge branch 'w36_MDL-35168_m23_yuipath' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 7fcfa721b76a27c01111c2f9f5dfa0f804906232
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 03 Sep 2012 23:07:39 +0800
Tag:    v2.4.0-beta

Merge branch 'w36_MDL-35168_m24_yuipath' of git://github.com/skodak/moodle

commit d7831c74bef1cf07351850899ea4689d04d6800e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 03 Sep 2012 22:18:33 +0800
Tag:    v2.2.5

Merge branch 'w36_MDL-35145_m22_guestdelete' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit e815aa8e043a66aa5e2a9317ea377beb27d6535b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 03 Sep 2012 22:18:15 +0800
Tag:    v2.3.2

Merge branch 'w36_MDL-35145_m23_guestdelete' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 55970f85a476ac49b0d8432d29b945b5644923b4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 03 Sep 2012 22:17:51 +0800
Tag:    v2.4.0-beta

Merge branch 'w36_MDL-35145_m24_guestdelete' of git://github.com/skodak/moodle

commit efca150b1585ad2204863c99756da5ed8c7ff71f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 03 Sep 2012 21:49:50 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-31973-master-7' of git://git.luns.net.uk/moodle

commit 5fcba2f9c8dd12024d013d01131c2fd9f6d49c76
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 31 Aug 2012 17:27:45 +0800
Tag:    v2.2.5

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit 6e6f74da2ff60ae432292328668aaa7ea1f1eb05
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 31 Aug 2012 17:27:25 +0800
Tag:    v2.3.2

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit e1d0830f4f8b076c4a03b4206182dc38f3d36206
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 31 Aug 2012 17:26:49 +0800
Tag:    v2.4.0-beta

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit f1f174e2bfc4092f0629bdebb571ee7613ce5dee
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 31 Aug 2012 02:12:31 +0800
Tag:    v2.3.2

Merge branch 'MDL-35147_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 165bfe54543426694d182100c6599cfef39eac45
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 31 Aug 2012 02:12:15 +0800
Tag:    v2.2.5

Merge branch 'MDL-35147_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 218010a6718a7b3074cb9fe19b39f19b66a21085
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 31 Aug 2012 00:43:02 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35147' of git://github.com/timhunt/moodle

commit 049b47ca09ec8ba643fe1225c0d606634d5b441c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 31 Aug 2012 00:32:20 +0800
Tag:    v2.2.5

Merge branch 'MDL-31244_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit a1db53480ce6c77c1d32c54807e1dd37f2dbb4c9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 31 Aug 2012 00:32:04 +0800
Tag:    v2.3.2

Merge branch 'MDL-31244_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 345892cfb728b08f0cc9a3905eeb855183189110
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 31 Aug 2012 00:27:03 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-31244' of git://github.com/timhunt/moodle

commit 06606caf718d532db04f89051b82228bc01084f4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Aug 2012 18:15:29 +0800
Tag:    v2.2.5

Merge branch 'wip-mdl-30121-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit a51eaaac4520ae8d6c8b018fbe482fdf45ca8941
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Aug 2012 18:15:14 +0800
Tag:    v2.3.2

Merge branch 'wip-mdl-30121-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit c63efc9a6b6597f403d0b2c3808d4de7f9a1825c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Aug 2012 18:14:46 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-mdl-30121' of git://github.com/rajeshtaneja/moodle

commit 3afd86559e1e93b41146faea3046fa7b94c02761
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Aug 2012 18:11:22 +0800
Tag:    v2.3.2

Merge branch 'wip-MDL-34290-MOODLE_23_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_23_STABLE

commit 69689b4c3e1d927740e6621f22b9158737644fff
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Aug 2012 18:11:00 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-34290-master' of git://github.com/marinaglancy/moodle

commit 238f7761aff584fe4a0c8afa2eeec3a67a57e08a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Aug 2012 06:42:43 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-31973-master-6' of git://git.luns.net.uk/moodle

commit 90241eaaf86b715341b62c05c4da69c72cefd8e9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Aug 2012 05:24:11 +0800
Tag:    v2.2.5

Merge branch 'MDL-29598_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE

commit f3d5fb4dec6d8ad84de56dfdb289b6cd94f4b17f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Aug 2012 05:23:50 +0800
Tag:    v2.3.2

Merge branch 'MDL-29598_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE

commit 71ff7c2c043b682c7211ef4481801cdf12b30e41
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Aug 2012 05:23:26 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-29598_master' of git://github.com/dmonllao/moodle

commit af1e3f282884bba5114148ea228fa9b334ca3056
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Aug 2012 03:05:26 +0800
Tag:    v2.4.0-beta

Merge branch 'w35_MDL-35070_m24_selfcleanup' of git://github.com/skodak/moodle

commit 5298faed69803d7d03c5ebbf2ff2a3802d2c890f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Aug 2012 02:51:37 +0800
Tag:    v2.4.0-beta

Merge branch 'w35_MDL-23875_m24_selfcohort' of git://github.com/skodak/moodle

commit 5e143a271c468533313814d0debecd66207bbb37
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Aug 2012 02:44:49 +0800
Tag:    v2.3.2

Merge branch 'MDL-34250_23' of github.com:stronk7/moodle into MOODLE_23_STABLE

commit 928dfdee48e0fbe94039bfa1b281c8f6981dc735
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Aug 2012 02:44:09 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34250' of github.com:stronk7/moodle

commit 6e8d3ac1bfe8557c4f5d535256bf7c8340b7a50d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Aug 2012 02:12:48 +0800
Tag:    v2.2.5

Merge branch 'MDL-25492_22' of git://github.com/jmvedrine/moodle into MOODLE_22_STABLE

commit 1c37f8865d7a9312eab2480b913049f3bf345114
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Aug 2012 02:10:43 +0800
Tag:    v2.2.5

Merge branch 'MDL-31837_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit ed29fa1274f7c04df2352b21ab0d0d2fb26c3d90
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Aug 2012 02:08:19 +0800
Tag:    v2.3.2

Merge branch 'MDL-25492_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE

commit 14941785d71ad8c97c40cb412d6ecfb84aa38595
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Aug 2012 02:02:02 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-25492' of git://github.com/jmvedrine/moodle

commit faf4ba4774e3f564df89e28cb2848cbc0ceb0d0b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Aug 2012 20:44:30 +0800
Tag:    v2.3.2

Merge branch 'MDL-34192_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE

commit d9700052734d0b44af3a17566642c763d23143b3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Aug 2012 20:44:06 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34192' of git://github.com/stronk7/moodle

commit 1a5367873d950a6cb8ada4e2e5fe0ebef02a7761
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Aug 2012 08:27:34 +0800
Tag:    v2.4.0-beta

Merge branch 'w35_MDL-35060_m24_sesstest' of git://github.com/skodak/moodle

commit a72ff024fbe353d7683c39ad6ce79a4f0b8cf2a0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Aug 2012 02:12:18 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-34310-master' of git://github.com/marinaglancy/moodle

commit 7b0c1bf02ae235c949075fd75ddba77727bbff28
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Aug 2012 02:06:19 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34306' of git://github.com/timhunt/moodle

commit 4df4c677bd8ad056c426adf16e846356b296deb6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Aug 2012 02:04:16 +0800
Tag:    v2.2.5

Merge branch 'MDL-34406_fullname_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 3860f948af9b1f2e2087477fe00b0e097b07396f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Aug 2012 02:03:52 +0800
Tag:    v2.3.2

Merge branch 'MDL-34406_fullname_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit f599c815973ef54e67b87b07736f8bb880171ac4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Aug 2012 02:03:01 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34406_fullname' of git://github.com/andyjdavis/moodle

commit 3dd9961f449fb367fff5e737c5edd3fc6ade3cbd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Aug 2012 00:51:25 +0800
Tag:    v2.2.5

Merge branch 'MDL-34430_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 9507653269c3ffb253cb0f7bdd0d89c752690c43
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Aug 2012 00:51:01 +0800
Tag:    v2.3.2

Merge branch 'MDL-34430_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit af08f5d0af68624e807b778f1e18349f64fb2a77
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Aug 2012 00:50:29 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34430' of git://github.com/timhunt/moodle

commit 006052e19c127f24379ce2032ce94541b3cd0caa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Aug 2012 00:36:19 +0800
Tag:    v2.2.5

Merge branch 'MDL-34993_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 79a6a832d7e0eaf0819272ff06a0f32bff903415
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Aug 2012 00:35:54 +0800
Tag:    v2.3.2

Merge branch 'MDL-34993_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit d683fcdf98c077cbaf3f906c15ab83c6a240315f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Aug 2012 00:35:23 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34993' of git://github.com/timhunt/moodle

commit 31970a66a85f44d999beb294a64739879fce22f5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Aug 2012 00:23:45 +0800
Tag:    v2.2.5

Merge branch 'm22_MDL-34994' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit eec3a5d48d81a31ab92b223bc7fe87b852b298e4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Aug 2012 00:20:44 +0800
Tag:    v2.3.2

Merge branch 'm23_MDL-34994' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

commit 1edce590bdbe8a13f9d9ae0c4028eff17d8ad202
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Aug 2012 00:17:55 +0800
Tag:    v2.4.0-beta

Merge branch 'master_MDL-34994' of git://github.com/danmarsden/moodle

commit 56f4e2a7a2b6dfd421e9ee61b3500843128adff3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Aug 2012 00:07:24 +0800
Tag:    v2.4.0-beta

Merge branch 'w35_MDL-35072_m24_mancleanup' of git://github.com/skodak/moodle

commit e5783fd132e9147aacefcfa6a3feee5bba1ea4f3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Aug 2012 23:54:55 +0800
Tag:    v2.2.5

Merge branch 'MDL-35026_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit e9c306f10e70665acb9607cea4b3f44184033ecf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Aug 2012 23:54:20 +0800
Tag:    v2.3.2

Merge branch 'MDL-35026_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 4299f5f6a8c5b843c18932c2bd9530b0e1534958
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Aug 2012 23:53:59 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35026' of git://github.com/timhunt/moodle

commit 70c160f27df55ebe6d7f050f47a188ec7b9a62cd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Aug 2012 23:51:41 +0800
Tag:    v2.2.5

Merge branch 'MDL-35003_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit b14d76c59f31b80230110c79c19d8e2708650cf0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Aug 2012 23:51:24 +0800
Tag:    v2.3.2

Merge branch 'MDL-35003_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 7f7cda07f2ca535fc686c4a7d859696c92d1ee92
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Aug 2012 23:50:55 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35003' of git://github.com/timhunt/moodle

commit c06b18a47554bbb4ebeb815ba46db70972619db9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Aug 2012 22:34:02 +0800
Tag:    v2.2.5

Merge branch 'MDL-35023_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 8f93d94ab2ea86ac240d4ec69dcbef2bdc938283
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Aug 2012 22:33:39 +0800
Tag:    v2.3.2

Merge branch 'MDL-35023_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 05a024d393cd05e97a1ec286bcec0ac2daccc819
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Aug 2012 22:32:30 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35023' of git://github.com/timhunt/moodle

commit b6cd7017c090eb8dfdb0d7561073ad38bc4287fc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Aug 2012 22:25:30 +0800
Tag:    v2.3.2

Merge branch 'MDL-35038_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit d324394594eae8f09f666bcccacecc1f66049253
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Aug 2012 22:24:17 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35038' of git://github.com/timhunt/moodle

commit f9033600cc4e1b2ab635bedbb776eca9b4b78b2d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Aug 2012 22:20:37 +0800
Tag:    v2.3.2

Merge branch 'MDL-35048_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit a787a404ea7541706c987cc453b1f45433685d24
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Aug 2012 22:20:19 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35048' of git://github.com/lazydaisy/moodle

commit aa81647c4c65f3c46113359d3e37a87fb67e3e2c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Aug 2012 22:17:06 +0800
Tag:    v2.2.5

Merge branch 'MDL-35055_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 473285edded68db58619a71fbef6bdd6a0048e23
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Aug 2012 22:16:46 +0800
Tag:    v2.3.2

Merge branch 'MDL-35055_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 6b2b869049655e524f859fd7ea18f577b9365b0f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Aug 2012 22:16:14 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35055' of git://github.com/timhunt/moodle

commit aec4783bf6abfae27a7e2ce30ec8a5379bab03b4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Aug 2012 21:58:19 +0800
Tag:    v2.4.0-beta

Merge branch 'w35_MDL-35061_m24_enrolfields' of git://github.com/skodak/moodle

commit 956592f590ab2b128b18198a884d158d51232f39
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 24 Aug 2012 01:18:56 +0800
Tag:    v2.2.5

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit 3330b54c2c8e781beb67c6c12259e0a2b1cf1b37
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 24 Aug 2012 01:18:40 +0800
Tag:    v2.3.2

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit 920d5b8d1a897c08281902d7a5510ee13268341e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 24 Aug 2012 01:18:22 +0800
Tag:    v2.4.0-beta

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit 0a31b2f3081f0bd5e609f2371e482afae8b73481
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Aug 2012 22:36:53 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34738_fixup' of git://github.com/jmvedrine/moodle

commit 364666f371fd51c3627a37bf6d3c7cbddcf71403
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Aug 2012 17:14:38 +0800
Tag:    v2.3.2

Merge branch 'MDL-34444' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit a701525345e8273a3b6d65ca962254ed3b6effaf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Aug 2012 16:49:30 +0800
Tag:    v2.3.2

Merge branch 'MDL-34444' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit 6c475847fb3ab70a4b7293a4d352ed3bb71369e8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Aug 2012 14:40:02 +0800
Tag:    v2.3.2

Merge branch 'MDL-34444' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit b6b34345ac0e8c762e31be295bcc73cb7e9ff471
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Aug 2012 09:41:14 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34853' of local stronk7 repo.

commit d90e2237fe0d7b600c37c0e2cce48bb3ec5ca975
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Aug 2012 08:34:35 +0800
Tag:    v2.2.5

Merge branch 'wip-mdl-32759-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit f16751f85616b481dd1597129fa638c2b5f4628c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Aug 2012 08:34:04 +0800
Tag:    v2.3.2

Merge branch 'wip-mdl-32759-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit df27efbd46f3c54593b01f1c835104f7b1b9a17c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Aug 2012 08:33:34 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-mdl-32759-warning' of git://github.com/rajeshtaneja/moodle

commit 407c0fbcd619d68c3ed511538811f529334cc8ba
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Aug 2012 08:12:11 +0800
Tag:    v2.2.5

Merge branch 'MDL-34702_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 69be24a7760dbecc34a16de45353a8e37eeeb360
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Aug 2012 08:11:07 +0800
Tag:    v2.3.2

Merge branch 'MDL-34702_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit b85b7b34b293214da2f4c0a18a4e47ec64476a54
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Aug 2012 08:10:22 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34702' of git://github.com/timhunt/moodle

commit b74390e38b87250df660cb4f686e2edf12bcae6b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Aug 2012 08:05:17 +0800
Tag:    v2.3.2

Merge branch 'MDL-34795-23' of git://github.com/srynot4sale/moodle into MOODLE_23_STABLE

commit 9075481920ee41e860d44e53666850e940815dae
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Aug 2012 08:04:47 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34795' of git://github.com/srynot4sale/moodle

commit e464af4462e8c0b3be65790ffc7b7c5f1bf18853
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Aug 2012 07:58:35 +0800
Tag:    v2.3.2

Merge branch 'w34_MDL-34864_m23_enrolcat' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit a477affda0fbbe7b222fff98a965ccfa098ae6be
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Aug 2012 07:58:13 +0800
Tag:    v2.4.0-beta

Merge branch 'w34_MDL-34864_m24_enrolcat' of git://github.com/skodak/moodle

commit ea438c8d7bd66e3b00af27665c38969d35d4c054
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Aug 2012 07:56:06 +0800
Tag:    v2.3.2

Merge branch 'w34_MDL-34776_m23_notinsql' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 41624a5682a88c1fdcb23dc8ceb0c4c5dce4560e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Aug 2012 07:55:34 +0800
Tag:    v2.4.0-beta

Merge branch 'w34_MDL-34776_m24_notinsql' of git://github.com/skodak/moodle

commit 0547143fad270d28c983e0599046b310afcd812b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Aug 2012 07:50:19 +0800
Tag:    v2.3.2

Merge branch 'MDL-34866_23' of git://github.com/rlorenzo/moodle into MOODLE_23_STABLE

commit 1f0f592cea71d4802675ca32a6b89b9678da9f5e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Aug 2012 07:47:20 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34866' of git://github.com/rlorenzo/moodle

commit dd12051df2307b956b4eee3e6869f446a0137535
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Aug 2012 04:24:20 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34899b' of git://github.com/srynot4sale/moodle

commit 864ca7d7008ea4a9a9c7e835c61196bfc7d157d4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Aug 2012 03:18:44 +0800
Tag:    v2.3.2

Merge branch 'w34_MDL-34893_m23_phpunitparams' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 77dd8ab1de70f459339e90e15af6037a1a439be1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Aug 2012 03:18:15 +0800
Tag:    v2.4.0-beta

Merge branch 'w34_MDL-34893_m24_phpunitparams' of git://github.com/skodak/moodle

commit 181884b480769dbbf7df975367db53da9f707d4a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Aug 2012 08:43:10 +0800
Tag:    v2.3.2

Merge branch 'MDL-34941-MOODLE_23_STABLE' of https://github.com/mouneyrac/moodle into MOODLE_23_STABLE

commit 70d6e4c123d1d90b8dc1f0ae9cf67b106f6d09a0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Aug 2012 08:42:33 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34941' of https://github.com/mouneyrac/moodle

commit 9b7738c8fb2c1aafb790f7f891b93eb2a4a4ab04
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Aug 2012 08:39:58 +0800
Tag:    v2.3.2

Merge branch 'w34_MDL-34912_m23_description' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit fffb9b9064098c260be3b170ae63ca475624186a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Aug 2012 08:39:10 +0800
Tag:    v2.4.0-beta

Merge branch 'w34_MDL-34912_m24_description' of git://github.com/skodak/moodle

commit a1301090138b3e00bb4e82100707db52b01b98d1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Aug 2012 08:25:28 +0800
Tag:    v2.3.2

Merge branch 'MDL-34889_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit ee998a687cd6e478ae946d492b8c5ae75976656b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Aug 2012 08:24:50 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34889' of git://github.com/timhunt/moodle

commit ac97fc2122e65aa175e248310843fc607569cc17
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Aug 2012 07:36:36 +0800
Tag:    v2.3.2

Merge branch 'MDL-34810_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 2bdbe662643473dee7052804c98236fe1dd879ac
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Aug 2012 07:36:15 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34810' of git://github.com/timhunt/moodle

commit 0142a4b5953bbd776a2ced7621cbb8f4e38c2622
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Aug 2012 07:29:08 +0800
Tag:    v2.2.5

Merge branch 'MDL-29847_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 9da82e9ba312e08978e221c2f86ff5866cfab6c9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Aug 2012 07:28:50 +0800
Tag:    v2.3.2

Merge branch 'MDL-29847_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit afe404068d39edb22052484c51e658c73fcc1b21
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Aug 2012 07:28:34 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-29847' of git://github.com/timhunt/moodle

commit d60f8ef2db09f606f8a24245724a41a12dcc51c7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Aug 2012 07:23:52 +0800
Tag:    v2.2.5

Merge branch 'MDL-31957-m22' of git://github.com/sammarshallou/moodle into MOODLE_22_STABLE

commit 0c6800e771d1c2d87a0cfdf99ff61f8b570c9e02
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Aug 2012 07:23:05 +0800
Tag:    v2.3.2

Merge branch 'MDL-31957-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE

commit 57733008c9ef86ac57d40d5def0c3fcf29fc2d51
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Aug 2012 07:21:18 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-31957-master' of git://github.com/sammarshallou/moodle

commit 2672817478b0c55015f0352bd8da274dfe380006
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Aug 2012 02:34:13 +0800
Tag:    v2.4.0-beta

Merge branch 'w34_MDL-34960_m24_gmapsv2drop' of git://github.com/skodak/moodle

commit 3dd2dce1cb7019516e3aa5f16f1d750ecdaee513
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Aug 2012 02:30:27 +0800
Tag:    v2.3.2

Merge branch 'w34_MDL-34959_m23_gmapsv3' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 5bed363980538c18e77946b7282db69fc7bac171
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Aug 2012 02:28:59 +0800
Tag:    v2.4.0-beta

Merge branch 'w34_MDL-34959_m24_gmapsv3' of git://github.com/skodak/moodle

commit de4c3e62cfdecd63bd6d72c230f642429ed5d66e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Aug 2012 02:18:37 +0800
Tag:    v2.2.5

Merge branch 'w34_MDL-34868_m22_gmapsv2' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 1c5f24e089eb937db47b207039ba0437cea959f6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Aug 2012 02:18:03 +0800
Tag:    v2.3.2

Merge branch 'w34_MDL-34868_m23_gmapsv2' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit fae6f7cad08130e70a014f65059eb41adbdd85ef
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Aug 2012 02:17:27 +0800
Tag:    v2.4.0-beta

Merge branch 'w34_MDL-34868_m24_gmapsv2' of git://github.com/skodak/moodle

commit 331d346e8f0bed92f2fb67baa6940538ddaacc1d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Aug 2012 22:35:20 +0800
Tag:    v2.3.2

Merge branch 'MDL-34756-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 040d4c63be4ae3dbcb3a3dfff0dfadbcfa0097e3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Aug 2012 22:34:18 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34756-master' of git://github.com/FMCorz/moodle

commit 85bd3fd899a635266f960fd3227d5e9bf6d90552
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Aug 2012 22:28:38 +0800
Tag:    v2.2.5

Merge branch 'MDL-28531-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 8ee474b89e608f623858d1a40ab3a1bc710c52a0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Aug 2012 22:28:21 +0800
Tag:    v2.3.2

Merge branch 'MDL-28531-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 53db05a507eba0a0f24dcff488c14b045ace5419
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Aug 2012 22:28:09 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-28531-master' of git://github.com/FMCorz/moodle

commit 59e2a775961201c213bb65237595e597ae730ac2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Aug 2012 19:59:55 +0800
Tag:    v2.2.5

Merge branch 'MDL-34529' of git://github.com/jasonilicic/moodle into MOODLE_22_STABLE

commit 2ebd2721243b62bc48cd164f85d584d30456d236
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 16 Aug 2012 23:22:18 +0800
Tag:    v2.2.5

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit 90231b24dfb6965292c06311365e930521f8f3cb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 16 Aug 2012 23:22:01 +0800
Tag:    v2.3.2

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit 0e6da6f7df9794951f9f23b3d53400de955cb84c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 16 Aug 2012 23:21:33 +0800
Tag:    v2.4.0-beta

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit 50b9b2e55280d84c1ec874ebcc29689501639972
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Aug 2012 09:35:34 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34583' of git://github.com/netspotau/moodle-mod_assign

commit 4dd7c5cafd214eda4a04cda6ac4c8e7444014a10
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Aug 2012 09:32:59 +0800
Tag:    v2.2.5

Merge branch 'MDL-34862_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 4ee439dbc296036dff62f3d194725c9e89a99b38
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Aug 2012 09:32:44 +0800
Tag:    v2.3.2

Merge branch 'MDL-34862_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 7ccede7af8ddae3398006dea82938fe65a97107e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Aug 2012 09:30:56 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34862' of git://github.com/timhunt/moodle

commit 91986f84c2fe8e9bc21f31f937a3ec64b7872ab1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Aug 2012 09:23:57 +0800
Tag:    v2.3.2

Merge branch 'MDL-34539' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit 92f2403bf3b5c2da458b5b716326594aa7fb0f7e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Aug 2012 09:18:58 +0800
Tag:    v2.4.0-beta

Merge branch 'master_MDL-34593_add_extra_plugin_param_to_get_form_elements_module' of git://github.com/kanikagoyal/moodle

commit e154c1b6da51628734ab9c1f06134f37944ed418
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Aug 2012 09:16:39 +0800
Tag:    v2.3.2

Merge branch 'MDL-34885_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 4998a013aa7ed80185858f0edf1a91abe30eb3ba
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Aug 2012 09:16:16 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34885' of git://github.com/timhunt/moodle

commit 833e1355336ffdef52143eba42becb9337eaf4b7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Aug 2012 08:04:10 +0800
Tag:    v2.3.2

Merge branch 'MDL-25347_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE

commit 717cabb7a44930834af477ee86ca55f47c2ec4b4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Aug 2012 08:03:52 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-25347_master' of git://github.com/dmonllao/moodle

commit 6b80e18a8bfc77b2fa6cb70388c2cd76e0e2526b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Aug 2012 07:22:49 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34745' of git://github.com/danpoltawski/moodle

commit 1135ae4908f0db6c0c1e9cd9c455f3701c093a0a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Aug 2012 07:16:48 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-29192' of git://github.com/danpoltawski/moodle

commit 76b97631b0ca8b098836aca0bb37febb4b3f3a4f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Aug 2012 06:41:04 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-25012' of git://github.com/danpoltawski/moodle

commit 6c20303ee12763ec85a86b7dd92e6e8b9230cf8e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Aug 2012 05:10:24 +0800
Tag:    v2.3.2

Merge branch 'w33_MDL-34782_m23_mysqlunsigned' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 267c898bfd6abe83291b455f6a74af9e79321dd5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Aug 2012 05:09:30 +0800
Tag:    v2.4.0-beta

Merge branch 'w33_MDL-34782_m24_mysqlunsigned' of git://github.com/skodak/moodle

commit 12445b37fc7c2acf44a093c973df4df722488b24
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Aug 2012 04:55:56 +0800
Tag:    v2.3.2

Merge branch 'MDL-34829' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit 428b30ce5e9d140cf071fdf028231b03a4bd2aba
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Aug 2012 04:45:34 +0800
Tag:    v2.3.2

Merge branch 'MDL-34783-MOODLE_23_STABLE-1' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE

commit 92886a8e1405d5abc82dbf56fed82229513c5aee
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Aug 2012 04:45:06 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34783-master-1' of git://git.luns.net.uk/moodle

commit f2316850509e8ff79b89be8da320e215cd7302db
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 Aug 2012 02:46:52 +0800
Tag:    v2.1.8

Merge branch 'install_21_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_21_STABLE

commit 20244afd2c4b5b27efd6ff460beff7a383c403a8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 Aug 2012 02:46:25 +0800
Tag:    v2.2.5

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit 8ff9b91e9f6b0934d2fa39431c5ae6102972cd6f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 Aug 2012 02:46:02 +0800
Tag:    v2.3.2

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit daabbee999c3bdd52d42962e0eafe80191b449a5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 Aug 2012 02:45:45 +0800
Tag:    v2.4.0-beta

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit f1bfa6bf337866901139520deaee809c45812a09
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Aug 2012 07:59:19 +0800
Tag:    v2.4.0-beta

Merge branch 'master_MDL-34656' of git://github.com/danmarsden/moodle

commit 8a991d869292ff199b9ff6f3a0741c2692ca24bf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Aug 2012 07:54:12 +0800
Tag:    v2.2.5

Merge branch 'MDL-34704_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 7abe8c31a604f4ead41ff45ceb98825693bbf3fb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Aug 2012 07:53:22 +0800
Tag:    v2.3.2

Merge branch 'MDL-34704_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit e5e26fb1d6acda93b776d2ce01593be1847e280a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Aug 2012 07:52:45 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34704' of git://github.com/timhunt/moodle

commit eab358f9161901ed6f89224f408560d5b13de387
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Aug 2012 07:01:28 +0800
Tag:    v2.2.5

Merge branch 'wip-mdl-30792-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 02d6791d05967cb0c5a26a617d86ad5e5fc7b4c2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Aug 2012 07:00:54 +0800
Tag:    v2.3.2

Merge branch 'wip-mdl-30792-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit 4137eb46a9be3b0976d7703dc5ed90a47ab96bbb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Aug 2012 07:00:12 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-mdl-30792' of git://github.com/rajeshtaneja/moodle

commit f718f5fd55d80341cda34a95e87fc5ec0d04338c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Aug 2012 06:02:10 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-32023-master' of https://github.com/mackensen/moodle

commit 80913617e8de61fce769632d15b1e32f1fb7fa68
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Aug 2012 05:58:27 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-29129-master' of https://github.com/mackensen/moodle

commit 12b7b430a43f7f0570b352f188e10fb7f1f8733e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 07 Aug 2012 08:12:57 +0800
Tag:    v2.2.5

Merge branch 'MDL-31753' of git://github.com/enovation/moodle into MOODLE_22_STABLE

commit 4ebc74c548ab79c7f10d49c4d403d832ba396a46
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 07 Aug 2012 08:09:25 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34711_master' of git://github.com/dmonllao/moodle

commit 9064a9af716e9f9bca9e14f5dfce4bec4bf3fe5b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 07 Aug 2012 03:16:50 +0800
Tag:    v2.3.2

Merge branch 'w32_MDL-34601_m23_wikischema' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 8b77ab0c1039d56d975f366dfcbeececebaf125b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 07 Aug 2012 03:15:46 +0800
Tag:    v2.4.0-beta

Merge branch 'w32_MDL-34601_m24_wikischema' of git://github.com/skodak/moodle

commit 2fba8f5a927773d551b5b5b7a66e0cb2f6b43d10
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 06 Jul 2012 00:34:27 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-34063-master' of git://github.com/marinaglancy/moodle

commit 353580b0e3127b934522a16f7647f920698ea112
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 05 Jul 2012 23:07:22 +0800
Tag:    v2.3.1

Merge branch 'MDL-33453-reference' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE

commit 8049a5c4138724337bb7ad3cea8ee1fa6128ad5a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 05 Jul 2012 20:19:06 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-33746-master' of git://github.com/marinaglancy/moodle

commit 97f5b526e6d5e486d7fdc618799f74b5a92c2fe1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 05 Jul 2012 09:41:51 +0800
Tag:    v2.1.7

Merge branch 'MDL-34145_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 3021f92c8ce6eb72256217da1e349d6324f18b57
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 05 Jul 2012 09:41:38 +0800
Tag:    v2.2.4

Merge branch 'MDL-34145_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit c3fcad7d55c51aca98cce52b2d9da537fa8b25c4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 05 Jul 2012 09:40:44 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34145' of git://github.com/timhunt/moodle

commit bbe378a63e1e4e99a0745b002bf52b38bc2cc82c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Jul 2012 10:16:05 +0800
Tag:    v2.3.1

Merge branch 'w27_MDL-33876_m23_delenrol' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit a079d364f33bc47b703ceca0c41d0bc6eb5339b5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Jul 2012 10:15:47 +0800
Tag:    v2.4.0-beta

Merge branch 'w27_MDL-33876_m24_delenrol' of git://github.com/skodak/moodle

commit b41f914927f7128e7426aede4bfaf59f1403ebda
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Jul 2012 22:18:41 +0800
Tag:    v2.3.1

Merge branch 'wip-MDL-33303-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE

commit 20ef104713e2ba6d13a86c686d0383f26defafa7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Jul 2012 22:17:36 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-33303-m24' of git://github.com/samhemelryk/moodle

commit 54bf19763eef86ec5d14d4a3fa19e62e6aa9b851
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Jul 2012 22:09:22 +0800
Tag:    v2.2.4

Merge branch 'MDL-33426-m22' of git://github.com/sammarshallou/moodle into MOODLE_22_STABLE

commit 4fcc358e12a18ef404ec540d754c0ff8dbdee632
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Jul 2012 22:08:03 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33426-master' of git://github.com/sammarshallou/moodle

commit 9039021b25dde730abdef0f8b855b0797091a5e2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Jul 2012 08:15:57 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33499' of git://github.com/netspotau/moodle-mod_assign

commit cf5b51af0e246b472882dbcb6b045ddbe995f533
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Jul 2012 07:59:22 +0800
Tag:    v2.3.1

Merge branch 'wip-MDL-33521-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE

commit f1d9ceb0e42f7abe41386173199a11d988fc3f33
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Jul 2012 07:58:48 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-33521-m24' of git://github.com/samhemelryk/moodle

commit 5d16ab2bba8964f4cf659311c44cfebf42b2ce8c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Jul 2012 07:04:47 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33796-master' of git://github.com/FMCorz/moodle

commit 8162a1308a6665fdaaaa83abd356258915406c98
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Jul 2012 05:54:02 +0800
Tag:    v2.1.7

Merge branch 'MDL-23813_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit dbaad889e83483e2f20fdafee339267f899b7e68
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Jul 2012 05:53:29 +0800
Tag:    v2.2.4

Merge branch 'MDL-23813_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit a788105e13999d94ac8cec8822ba87d86e01e5fc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Jul 2012 05:50:39 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-23813' of git://github.com/timhunt/moodle

commit 43a6a288b45e70279b977b4e5923c400d8030544
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Jul 2012 03:05:08 +0800
Tag:    v2.4.0-beta

Merge branch 'mssql-case-sensitive' of git://github.com/danpoltawski/moodle

commit e2710cb374fc535484f2d0f7aa9ebcf574aa1db3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Jul 2012 00:21:04 +0800
Tag:    v2.2.4

Merge branch 'w27_MDL-34121_m22_killbackupmess' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit af63cc85df8544503573942e4052c068a857ef86
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Jul 2012 00:16:54 +0800
Tag:    v2.3.1

Merge branch 'w27_MDL-34121_m23_killbackupmess' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit d207a888baa28f8ae19d0c87c056caf18b69075d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Jul 2012 00:12:57 +0800
Tag:    v2.4.0-beta

Merge branch 'w27_MDL-34121_m24_killbackupmess' of git://github.com/skodak/moodle

commit 18df418a50ae116f8749de2bb509f439bab421a1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 02 Jul 2012 06:45:26 +0800
Tag:    v2.1.7

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 880b243c8d991e994844cbd96a6a20c3d4ae7444
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 02 Jul 2012 06:41:10 +0800
Tag:    v2.2.4

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit 15c9acb21a29efd57862827924a4d781623031d7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 02 Jul 2012 06:39:51 +0800
Tag:    v2.4.0-beta

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit 6e4c643101b4522604b38980f04a7abbca7ceada
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 02 Jul 2012 06:30:46 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34119_master' of git://github.com/lazydaisy/moodle

commit 4fa4a727b4d41fa225597c2aa99ba06708f86b89
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 02 Jul 2012 06:30:28 +0800
Tag:    v2.3.1

Merge branch 'MDL-34119_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit 9ea40f27a07972b63289aab669413b5d15dc8947
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 02 Jul 2012 04:01:22 +0800
Tag:    v2.3.1

Merge branch 'w27_MDL-34130_m23_recordsettests' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit cf16aed6f72179e5b3ba25f7c80b9faad839f78c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 02 Jul 2012 03:58:59 +0800
Tag:    v2.4.0-beta

Merge branch 'w27_MDL-34130_m24_recordsettests' of git://github.com/skodak/moodle

commit 555769489a8de49d776ed8e45b05ab59f3a14817
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sun, 01 Jul 2012 08:15:41 +0800
Tag:    v2.1.7

Merge branch 'MDL-32249c-21' of github.com:srynot4sale/moodle into MOODLE_21_STABLE

commit 260bbdbc0955042a990257207fac95c54dde3e51
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sun, 01 Jul 2012 08:15:19 +0800
Tag:    v2.2.4

Merge branch 'MDL-32249c-22' of github.com:srynot4sale/moodle into MOODLE_22_STABLE

commit 9d774c94457578348ef0bc173f79946abce1d3b5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sun, 01 Jul 2012 08:14:39 +0800
Tag:    v2.3.1

Merge branch 'MDL-32249c-23' of github.com:srynot4sale/moodle into MOODLE_23_STABLE

commit ba4e17574f0a841f1b0e147b2a4037e641e60585
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sun, 01 Jul 2012 08:02:56 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-32249c' of github.com:srynot4sale/moodle

commit f6653bfd4729fe4f7b4b8283bdd4676766be1721
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sun, 01 Jul 2012 04:00:34 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-31201' of git://github.com/danpoltawski/moodle

commit 7dcdca9c8529b64c64d5173c1685fe7fd1000e7b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 25 Jun 2012 23:44:13 +0800
Tag:    v2.3.0

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit 2b8387bd1eb2415884e06a6d440299dcfef5836c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 25 Jun 2012 07:30:29 +0800
Tag:    v2.0.10

Merge branch 'w25_MDL-33733_m20_unzipstorage' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit bce307ee772f69a2a1c0f9ed785564128b5c6e71
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 25 Jun 2012 07:23:07 +0800
Tag:    v2.1.7

Merge branch 'w25_MDL-33733_m21_unzipstorage' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 1257e3b7297bf5a321fc76da814e98d7b805ca19
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 25 Jun 2012 07:21:52 +0800
Tag:    v2.2.4

Merge branch 'w25_MDL-33733_m22_unzipstorage' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit b506964761e744b29f61a60542b89df4a795b6a5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 25 Jun 2012 00:29:30 +0800
Tag:    v2.0.10

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit d332e9f0127532b15ddde6766aa99bd57c04a5e6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 25 Jun 2012 00:29:11 +0800
Tag:    v2.1.7

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 84acd5d794a886b3c260a4fe261f327816d1e9ac
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 25 Jun 2012 00:28:55 +0800
Tag:    v2.2.4

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit bec3cd5b18ac9309a501317b312fcb71266eb404
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 25 Jun 2012 00:27:53 +0800
Tag:    v2.3.0-rc1

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit cb172822e5215668956f819a5f32e9c03d193684
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Jun 2012 08:03:47 +0800
Tag:    v2.3.0-rc1

Merge branch 'w25_MDL-32003_m23_dbcleanup' of git://github.com/skodak/moodle

commit 984109868d7a38177b2d9d07c54cf49bc029f8d6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Jun 2012 09:10:12 +0800
Tag:    v2.2.4

Merge branch 'MDL-33523_22' of git://github.com/dmiletic/moodle into MOODLE_22_STABLE

commit f18ad1b781fd6703d8f4dcd0b629580d7df5b473
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Jun 2012 09:09:30 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33523_master' of git://github.com/dmiletic/moodle

commit 926b08ca4b55b55415e8bf3167d705bf96ce0808
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Jun 2012 09:05:52 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33623' of git://github.com/danpoltawski/moodle

commit 25c94edb27da9e3a18ff0b842c79f160e1ab87d2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Jun 2012 09:01:30 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33469' of git://github.com/danpoltawski/moodle

commit f98973c2ff4df54343b27086470985eb6a83eeaf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Jun 2012 08:59:46 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33294' of git://github.com/danpoltawski/moodle

commit f2904fe2432894bcc1741363d4edb6b9c1357f7b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Jun 2012 08:56:19 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33724' of git://github.com/danpoltawski/moodle

commit e165512d3a790010b27c798ef6879fc79aa74b08
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Jun 2012 06:54:39 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33778' of git://github.com/timhunt/moodle

commit e04a0e32c7af4043eb58e4fcfc1568050276e48e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 18 Jun 2012 18:31:37 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33552' of git://github.com/danpoltawski/moodle

commit b18066df839a3021e4603dbc59736c7b41b72424
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 18 Jun 2012 16:29:12 +0800
Tag:    v2.3.0-beta

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit b37681d59c8224bc2dcbeb0096574781ea6c3217
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 15 Jun 2012 18:16:56 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33726' of git://github.com/danpoltawski/moodle

commit 363cb2df7ea8f407604edf8752ce6559a2c0a81d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 15 Jun 2012 18:07:59 +0800
Tag:    v2.3.0-beta

Merge branch 'w24_MDL-33768_m23_filters' of git://github.com/skodak/moodle

commit 3f2939fa3e88a0cb7bf71cdcef1d945b90c8f8cf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 14 Jun 2012 00:01:31 +0800
Tag:    v2.3.0-beta

Merge branch 'w24_MDL-33204_m23_importsort' of git://github.com/skodak/moodle

commit f7b3e092e939d42acf89aa60c0066de144f50cef
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Jun 2012 22:40:07 +0800
Tag:    v2.3.0-beta

Merge branch 'w24_MDL-33635_m23_sort' of git://github.com/skodak/moodle

commit 50c5d7ae6ddc430f73a0b4e928b1b56e66e69730
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Jun 2012 06:57:26 +0800
Tag:    v2.1.7

Merge branch 'MDL-33682_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 0f63503db034ec01f437050d002a798a0fbd4332
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Jun 2012 06:56:22 +0800
Tag:    v2.2.4

Merge branch 'MDL-33682_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 1df09d3af2230dc6532718c7ea17ed25605ebccf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Jun 2012 06:37:42 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33682' of git://github.com/timhunt/moodle

commit e9637ea9ced8aff9539d4aae15e3a7f030bd21ec
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Jun 2012 06:07:23 +0800
Tag:    v2.1.7

Merge branch 'MDL-33681_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 897329c2473d330cc5809dacf23e6fe2ed70e331
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Jun 2012 06:06:41 +0800
Tag:    v2.2.4

Merge branch 'MDL-33681_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit dbe4bcc959d0a4cdea29554ce0f5647f148aa238
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Jun 2012 06:06:26 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33681' of git://github.com/timhunt/moodle

commit 2903a92b297a5301ca384b9e2d647e8afed76584
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jun 2012 18:33:54 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33123-master' of git://github.com/ankitagarwal/moodle

commit e47275fa0d0d46d19fab3adcbc954a299d9b5d45
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jun 2012 18:31:27 +0800
Tag:    v2.3.0-beta

Merge branch 'w24_MDL-33636_m23_yuislash' of git://github.com/skodak/moodle

commit 417f9d311bc92f5af7a2142b54a9f2f23f09245a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jun 2012 16:07:15 +0800
Tag:    v2.1.7

Merge branch 'w24_MDL-33670_m21_ofadmin' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit b9043a5d7b8112502a2f7f3774553c53dbe9408e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jun 2012 08:55:52 +0800
Tag:    v2.0.10

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 5fbd62c25488cacecddb5112fb315492f80a05d2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jun 2012 08:55:35 +0800
Tag:    v2.1.7

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit acb0b565b10e11e160f8ceebd9295a571c8845b0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jun 2012 08:55:22 +0800
Tag:    v2.2.4

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit 92b0d9820e64be637db25ac893fd461d1e6319cb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jun 2012 08:55:03 +0800
Tag:    v2.3.0-beta

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit 37b8257de52acb97915512ee328cb815a8104201
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jun 2012 08:22:26 +0800
Tag:    v2.3.0-beta

Merge branch 'equella' of git://github.com/danpoltawski/moodle

commit fcbf68fd050a14989d1cece0aafc08c7209e10e9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 09 Jun 2012 01:32:26 +0800
Tag:    v2.3.0-beta

Merge branch 'w23_MDL-33595_m23_phpunitinit' of git://github.com/skodak/moodle

commit 997c7e27444e0d24250ca7136b36e3369c7b7c4d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 08 Jun 2012 23:08:18 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33471' of git://github.com/timhunt/moodle

commit 34025ea1c2ecdbd98b9c997f9c975a9d3de91dd5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 08 Jun 2012 07:57:04 +0800
Tag:    v2.1.7

Merge branch 'w23_MDL-33583_m21_keepall' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 887e2c85359aa61b9c9ec9f353767972e9c40506
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 08 Jun 2012 07:56:31 +0800
Tag:    v2.2.4

Merge branch 'w23_MDL-33583_m22_keepall' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 61aaad48332b088b62b599c87b7871aa4141b976
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 08 Jun 2012 07:56:06 +0800
Tag:    v2.3.0-beta

Merge branch 'w23_MDL-33583_m23_keepall' of git://github.com/skodak/moodle

commit a3974b010629e72d12b9d01210a0ea54defaebfd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 08 Jun 2012 07:43:40 +0800
Tag:    v2.3.0-beta

Merge branch 'w23_MDL-30725_m23_backuptrash' of git://github.com/skodak/moodle

commit 9987a9e0792474f1bd47d04bdb6803f9795fc9a1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 08 Jun 2012 06:05:24 +0800
Tag:    v2.1.7

Merge branch 'MDL-32985_integration_21' of git://github.com/merrill-oakland/moodle into MOODLE_21_STABLE

commit 746a8b2838a11f6826f456deda9eb583239a8e9a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 08 Jun 2012 06:05:01 +0800
Tag:    v2.2.4

Merge branch 'MDL-32985_integration_22' of git://github.com/merrill-oakland/moodle into MOODLE_22_STABLE

commit 03a94794fc6fcae6ff3c8635b32e0bdd6909054f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 08 Jun 2012 06:04:19 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32985_integration' of git://github.com/merrill-oakland/moodle

commit 1f0856d6bfb5e112d057a74c06028826896fec63
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Jun 2012 08:23:55 +0800
Tag:    v2.1.7

Merge branch 'MDL-32649_ratings_sort_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit 55a83bd03474b953d32ed3299ac034f02badc020
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Jun 2012 08:23:30 +0800
Tag:    v2.2.4

Merge branch 'MDL-32649_ratings_sort_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 0b1f477618aa36bb79d4c0d27b2678612a5ebd6b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Jun 2012 08:22:33 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32649_ratings_sort' of git://github.com/andyjdavis/moodle

commit 335a24ea72f143c3eae3f8e023e272a4d19f407f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Jun 2012 08:03:06 +0800
Tag:    v2.1.7

Merge branch 'MDL-32985_m21' of git://github.com/merrill-oakland/moodle into MOODLE_21_STABLE

commit 8b01dd9d0f30730d4ee4fc411d1d952ec1cb4a75
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Jun 2012 08:02:40 +0800
Tag:    v2.2.4

Merge branch 'MDL-32985_m22' of git://github.com/merrill-oakland/moodle into MOODLE_22_STABLE

commit 4baa746eaee5fe8e7284b3c65ac7d88aef8502b5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Jun 2012 08:02:12 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32985' of git://github.com/merrill-oakland/moodle

commit d291dfd0aa32afbe86cba1d25b685bc2c0b3be62
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Jun 2012 06:42:59 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32107-master' of git://github.com/sammarshallou/moodle

commit c76bd308856ffa637ae5e778791c1d77e6d8fc61
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Jun 2012 06:38:04 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33133-master' of git://github.com/sammarshallou/moodle

commit 080f585f3924a82e56322570694a0dadfaec2aca
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Jun 2012 03:47:14 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33507' of git://github.com/danpoltawski/moodle

commit 0b702fca0b1d43f1adac4c8fdfb885e4ed4051b5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Jun 2012 01:55:21 +0800
Tag:    v2.3.0-beta

Merge branch 'w23_MDL-33436_m23_testprinter' of git://github.com/skodak/moodle

commit a30167510155dc1202649efefac607bff01dda40
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 04 Jun 2012 17:33:47 +0800
Tag:    v2.3.0-beta

Merge branch 'w23_MDL-33007_m23_buggyiconv' of git://github.com/skodak/moodle

commit f1cdf71eb62857c411a17b81b57d04aaa4a287fa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 01 Jun 2012 15:43:54 +0800
Tag:    v2.0.10

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 4a7f742d2ef3db80e1cdaec6d1c84b1d77350388
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 01 Jun 2012 15:43:36 +0800
Tag:    v2.1.7

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit f674c132b32e96ee2c972dcf9d93e2e7667fc641
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 01 Jun 2012 15:43:19 +0800
Tag:    v2.2.4

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit 5669b28d59872045d72172c8a61468a839dc3be7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 01 Jun 2012 06:58:08 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33326' of git://github.com/stronk7/moodle

commit dac01a7444706c2a1ee610a08e9fcff829d6dbe5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 31 May 2012 22:14:57 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33389_master' of git://github.com/kordan/moodle

commit b3520a4ae70571f7fa656f01cbe87c3df4a8a635
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 May 2012 03:25:01 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33359' of git://github.com/danpoltawski/moodle

commit c1ca7fdcccbf5246f8b96c51e182ec562b13dd55
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 25 May 2012 18:45:01 +0800
Tag:    v2.1.7

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 5606d3aa5c4a02e0b897226f6dd79cc3319d99dc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 25 May 2012 18:44:47 +0800
Tag:    v2.2.4

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit e81c01b6768bbf03466a68ae5474714fe7b959b5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 21 May 2012 03:43:40 +0800
Tag:    v2.3.0-beta

Subtree merged git://github.com/skodak/moodle-mod_book.git (master branch) into mod/book

commit 5356317a41b0d710a8cdb475179d7ac382096d27
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 19 May 2012 18:17:59 +0800
Tag:    v2.0.10

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit b571be75c54bf64afed95b5f54224bce62a37f9a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 19 May 2012 18:17:43 +0800
Tag:    v2.1.7

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 2871fedb58a2f855708a9f484ea34790f54cd07a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 19 May 2012 18:17:27 +0800
Tag:    v2.2.4

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit 5204c07bd452e66ee688ff96f370c467376bae2f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 19 May 2012 18:17:09 +0800
Tag:    v2.3.0-beta

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit 754c2deab608b82b078d9ae7dee9fd704183b5b3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 18 May 2012 04:35:57 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32941' of git://github.com/mouneyrac/moodle

commit dd420abadfc9604873891b1b454b02123c954bc5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 May 2012 05:48:50 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-24419-master' of git://github.com/sammarshallou/moodle

commit ea01d3c601208ed75d90f9cb3504a7b520750739
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 May 2012 22:23:00 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32233-core_course_duplicate_course-usersdata' of git://github.com/jleyva/moodle

commit 6b4769bc8b621b3df1beca1c4bc167d8c6f22bcf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 May 2012 17:41:48 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32662-core_course_groups_xxx_groupings' of git://github.com/jleyva/moodle

commit 3e632cf4e603c30ba57ddf9660c4e100ad23d92e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 15 May 2012 19:14:13 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32998' of git://github.com/mouneyrac/moodle

commit 4617939723f884f5460f50dbae493d3d15a983ca
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 15 May 2012 18:59:18 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32949' of git://github.com/mouneyrac/moodle

commit dcbe6a30ff854251efa5513a9329a73076d77e51
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 May 2012 18:11:11 +0800
Tag:    v2.0.9

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 3478ce9bdc38046b6f4c9e6b34be716c454a0588
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 May 2012 18:10:56 +0800
Tag:    v2.1.6

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 6cf9033d8db0394c4e7a5373536301b2c8b74bb8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 May 2012 18:10:42 +0800
Tag:    v2.2.3

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit 28f7bbb0c879cca3b5b63e46066433b17b86ee45
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 May 2012 18:10:16 +0800
Tag:    v2.3.0-beta

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit 6265a43af7004fead9106931871dee6eb3e918e4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 May 2012 09:13:00 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32924' of git://github.com/timhunt/moodle

commit 1194a6b4850634a6196303cb78c37c4dcf272dae
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 10 May 2012 01:33:02 +0800
Tag:    v2.0.9

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 7b84d2886a6699101e29e745cda7b17b59748eec
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 10 May 2012 01:32:26 +0800
Tag:    v2.1.6

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 6ba42caef73373184e716ee7061c8e10605d3fc0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 10 May 2012 01:31:46 +0800
Tag:    v2.2.3

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit 5c7b68f25ad7b66bc7a8db1190d67cb5a017d043
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 10 May 2012 01:31:03 +0800
Tag:    v2.3.0-beta

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit c0502c170ce1f4a10ac762be96f0a9ee3d604c1a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 04 May 2012 19:07:14 +0800
Tag:    v2.1.6

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 455392561405d8bdd4ae0e3ac0ffdef203a169e1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 04 May 2012 19:07:00 +0800
Tag:    v2.2.3

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit f8e293008dd2a45e5d29a42eae6c0be396d2fcd0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 04 May 2012 19:06:42 +0800
Tag:    v2.3.0-beta

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit bea7f96c876133ddb67d8994e725cb75af77d625
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 04 May 2012 16:01:07 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32754' of git://github.com/netspotau/moodle-mod_assign

commit 97101a0397f8ca79d82accd0355ffb1969eebb6e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 04 May 2012 00:22:05 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32693' of git://github.com/danpoltawski/moodle

commit f171c37dda2424a64060ee38df967902c5f328c3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 03 May 2012 18:22:22 +0800
Tag:    v2.3.0-beta

Merge branch 'w18_MDL-32697_m23_oci' of git://github.com/skodak/moodle

commit 668f04282a991b6552e405a6893edd87fdbc2e16
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 03 May 2012 06:46:39 +0800
Tag:    v2.1.6

Merge branch 'wip-mdl-32234-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit 46d732c25267cff90032b5e6bf6a125856253777
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 03 May 2012 06:40:23 +0800
Tag:    v2.2.3

Merge branch 'wip-mdl-32234-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 150166d37163befcbdb71ee5a8a2c013d35d5a60
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 03 May 2012 06:35:34 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-32234' of git://github.com/rajeshtaneja/moodle

commit 7649be6ea07c1c953013e44ee2953a572b941db4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 27 Apr 2012 18:41:35 +0800
Tag:    v2.1.6

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 5f5990903f6f867eee96ba5bba413878ea886993
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 27 Apr 2012 18:41:09 +0800
Tag:    v2.2.3

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit cef0090c51acdd4c67d901f49501b9b2c4d71241
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 27 Apr 2012 18:38:28 +0800
Tag:    v2.3.0-beta

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit 7c0d3f4c1d1a500dd3b106dc3a612cbaa93d6239
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 27 Apr 2012 09:15:51 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-26014-master' of git://github.com/phalacee/moodle

commit ee5855687e04cad63b8312f960278dd738b14f79
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 26 Apr 2012 09:32:08 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31052-js-rewrite' of git://github.com/danpoltawski/moodle

commit 862f48225dedce4b3abde1abde5d4d3d806da338
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 26 Apr 2012 08:59:35 +0800
Tag:    v2.1.6

Merge branch 'MDL-19263-21' of https://github.com/mackensen/moodle into MOODLE_21_STABLE

commit c821346cfeac9cd6807b4058fdc277be1938c96f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 26 Apr 2012 08:59:16 +0800
Tag:    v2.2.3

Merge branch 'MDL-19263-22' of https://github.com/mackensen/moodle into MOODLE_22_STABLE

commit e97eefd8c86cb9b1b05cddd1421143a20ee7e69b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 26 Apr 2012 08:46:21 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-19263-master' of https://github.com/mackensen/moodle

commit 538d482927f619d561dd0f43a52e91d7763ef01d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 26 Apr 2012 08:21:22 +0800
Tag:    v2.1.6

Merge branch 'MDL-32630-workshop-calendar_21' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit b8fffc6128060f93720cf1ec273bfaa4e8c38da4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 26 Apr 2012 08:20:22 +0800
Tag:    v2.2.3

Merge branch 'MDL-32630-workshop-calendar_22' of git://github.com/mudrd8mz/moodle into MOODLE_22_STABLE

commit 0529f63373ee081e6f937a77535ded5eb7eb43ee
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 26 Apr 2012 08:17:00 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32630-workshop-calendar' of git://github.com/mudrd8mz/moodle

commit d7f84a2962ff5e329af0a154a6c4e59e9838e180
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Apr 2012 21:14:27 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32471-thumbnails' of git://github.com/mudrd8mz/moodle

commit 7a48124d69d5e18f75c19a7040bc2a41439e5c2c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Apr 2012 19:08:19 +0800
Tag:    v2.1.6

Merge branch 'MDL-32192_copy_string_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit cf1f0dfb43749d62382178e1686085dd6af4c46e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Apr 2012 19:08:05 +0800
Tag:    v2.2.3

Merge branch 'MDL-32192_copy_string_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit e69ac1546bee2fe5cd854e8a495ae17212fd155a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Apr 2012 19:07:48 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32192_rename_string' of git://github.com/andyjdavis/moodle

commit 9c51f675fa7aebb7c77839a4815a2b8cab1c09c5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Apr 2012 09:40:53 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-32417-master' of git://github.com/marinaglancy/moodle

commit 9a2bb1ee2c6c3004330f49b9d61cad78b625d7ec
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Apr 2012 09:35:21 +0800
Tag:    v2.1.6

Merge branch 'wip-MDL-28941-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE

commit 344c07c3de449537b94df69b856d777d6a649291
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Apr 2012 09:20:23 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-26959-master' of git://github.com/phalacee/moodle

commit d3cb25dfefbf7711aacec7f2ba221f9400c35c15
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Apr 2012 09:02:14 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32322' of git://github.com/timhunt/moodle

commit 2ae4f3849ad100916214e6b1498b7fc19a099393
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Apr 2012 08:28:50 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32490' of git://github.com/bostelm/moodle

commit cb626376c1bddd7bf0a6f0dc5591de0c6b4a9524
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Apr 2012 08:05:09 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32566_master' of git://github.com/kordan/moodle

commit b2313c434fd90f09eda6cb86f5480655cc8a33a1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Apr 2012 07:57:28 +0800
Tag:    v2.1.6

Merge branch 'MDL-32082_messaging_readability_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit 89d13f61cabd191901c27a7480a6beccb3aa5579
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Apr 2012 07:57:13 +0800
Tag:    v2.2.3

Merge branch 'MDL-32082_messaging_readability_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 0317b8d4b35d0c5b4e41f57bbd608bf63e5ebde8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Apr 2012 07:55:24 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32082_messaging_readability' of git://github.com/andyjdavis/moodle

commit 4790c88e85e01ce608a2d86644d96c86a43e6cae
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Apr 2012 07:13:22 +0800
Tag:    v2.1.6

Merge branch 'wip-MDL-30478-MOODLE_21_STABLE' of git://github.com/abgreeve/moodle into MOODLE_21_STABLE

commit 5f250cff88bfda02ff94314e4675fc4d69ce8f23
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Apr 2012 07:12:41 +0800
Tag:    v2.2.3

Merge branch 'wip-MDL-30478-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit ee35fa43de3c5cd2364d5faed96ba7ed3386667a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Apr 2012 07:11:38 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-30478-master' of git://github.com/abgreeve/moodle

commit a52b49b925ecb0a51b2739e157020f13f6381907
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Apr 2012 05:30:38 +0800
Tag:    v2.1.6

Merge branch 'MDL-31548-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit 46c485a63cb8872812e757527299601bed1e3db3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Apr 2012 05:29:54 +0800
Tag:    v2.2.3

Merge branch 'MDL-31548-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 795558d3e58079621da4b211bcfe9342c9b7209c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Apr 2012 03:56:57 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31548-master' of git://github.com/ankitagarwal/moodle

commit 04cc6a1ba1ac7cb42df3e4afc1edd820cd1d6fdb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Apr 2012 19:10:08 +0800
Tag:    v2.1.6

Merge branch 'MDL-32249-21' of github.com:srynot4sale/moodle into MOODLE_21_STABLE

commit b5dd45511d6072a9b0d1f7f702508d0a3269b760
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Apr 2012 18:58:50 +0800
Tag:    v2.2.3

Merge branch 'MDL-32249-22' of github.com:srynot4sale/moodle into MOODLE_22_STABLE

commit c833026b24062b5c5ffe2540e2fb2276ad72c9f2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Apr 2012 18:56:30 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32249' of github.com:srynot4sale/moodle

commit 14ffb9195918975d05d67d9b98ef81ad64ac5622
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Apr 2012 16:37:13 +0800
Tag:    v2.3.0-beta

Merge branch 'w17_MDL-32574_m23_adodb' of git://github.com/skodak/moodle

commit 434fc13dbec8348d42a1988bdf9eff1e7d5d2bf7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Apr 2012 07:47:14 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32454-master-1' of git://git.luns.net.uk/moodle

commit 55a0c2d787d888aab1f22b8e613606f92aed216a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Apr 2012 07:42:28 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32514-master-1' of git://git.luns.net.uk/moodle

commit 0742a01d54ebb56023590a5de4821627cba369ea
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Apr 2012 07:01:06 +0800
Tag:    v2.2.3

Merge branch 'MDL-19549-22' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit 59894544989de8d13ea35638332cdb764c9b9e9f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Apr 2012 07:00:16 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-19549' of git://github.com/danpoltawski/moodle

commit 02c71f990f542ffc5c0de26df8578f49b8ee4eda
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Apr 2012 06:31:18 +0800
Tag:    v2.1.6

Merge branch 'MDL-28176-21' of git://github.com/danpoltawski/moodle into MOODLE_21_STABLE

commit cbc658976975f0e302ef62371ab3d6ffc56fbb9c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Apr 2012 06:31:06 +0800
Tag:    v2.2.3

Merge branch 'MDL-28176-22' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit 9614e54bfcfea9f29cecf33eb6001eb57180e0d5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Apr 2012 06:30:50 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-28176' of git://github.com/danpoltawski/moodle

commit db472efd13d4b186dc338effba69fafd8734ea0e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Apr 2012 06:09:05 +0800
Tag:    v2.1.6

Merge branch 'MDL-32134-21' of git://github.com/danpoltawski/moodle into MOODLE_21_STABLE

commit f46c9dd0f2d8b19e7b058f5d28745aadcc9fd2de
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Apr 2012 06:08:44 +0800
Tag:    v2.2.3

Merge branch 'MDL-32134-22' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit f24628a29021e60d2fd17d265fdb859171217002
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Apr 2012 06:07:23 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32134' of git://github.com/danpoltawski/moodle

commit 5a2d320ca6764afe9028a620b77a14ccf762084a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Apr 2012 06:05:16 +0800
Tag:    v2.2.3

Merge branch 'wip-MDL-26500-22' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit c168d35af5af8c43c0db647eed8dd2142a870769
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Apr 2012 06:04:51 +0800
Tag:    v2.1.6

Merge branch 'wip-MDL-26500-21' of git://github.com/danpoltawski/moodle into MOODLE_21_STABLE

commit 3e0b0ae59b2a2c682bf672797889a3e24251c8da
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Apr 2012 06:03:36 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-26500' of git://github.com/danpoltawski/moodle

commit 099aaa8d51fd85dd15c1e1b9f3fb679287e620f2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Apr 2012 08:31:47 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32061-master-2' of git://git.luns.net.uk/moodle

commit 721c418985b58b30a6b539a2e50f3c248267a1c2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Apr 2012 04:39:36 +0800
Tag:    v2.1.6

Merge branch 'w16_MDL-30242_m21_session' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 2a1f43a1db6c953f374e8fda64f1a2c7035d4eef
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 Apr 2012 06:29:35 +0800
Tag:    v2.3.0-beta

Merge branch 'w16_MDL-32448_m23_yui350' of git://github.com/skodak/moodle

commit bf8086623db17739fb33e654c8060ff230a4ab76
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 Apr 2012 06:16:28 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32359' of git://github.com/timhunt/moodle

commit f229d83c113cafa4debc1319c96e15fcd93c6bd4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 11 Apr 2012 07:44:39 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-22895-master' of git://github.com/ankitagarwal/moodle

commit 7475638c2aa0ae594dcbd291bb76070aba214dec
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 11 Apr 2012 02:59:34 +0800
Tag:    v2.3.0-beta

Merge branch 'w15_MDL-32368_m23_bytea' of git://github.com/skodak/moodle

commit b3312696873ca60d6d7feed9d931ad91eedebdf9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 11 Apr 2012 00:55:33 +0800
Tag:    v2.3.0-beta

Merge branch 'w15_MDL-32365_m23_id' of git://github.com/skodak/moodle

commit 2000cd85da39e7862931cdb595ebc9bd57b9919b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Apr 2012 07:32:15 +0800
Tag:    v2.3.0-beta

Merge branch 'w14_MDL-32149_m23_phpunit2' of git://github.com/skodak/moodle

commit 80a9e2aab9b7a39d7885f47c1401cb632fad6181
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Apr 2012 06:12:02 +0800
Tag:    v2.1.6

Merge branch 'MDL-32240_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit bdd773ba4094d6ee267977118967fd209a196319
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Apr 2012 06:11:43 +0800
Tag:    v2.2.3

Merge branch 'MDL-32240_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 959a709ebecd8c5210e39a97cf39cbb2516d5bd6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Apr 2012 06:10:37 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32240' of git://github.com/timhunt/moodle

commit eeb3295fd8d7912ef0f531afba461913f71ad3d4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Apr 2012 05:59:07 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-32265-m23' of git://github.com/samhemelryk/moodle

commit 471b1c8b30bb6f1d2017b04ddbcb171c87a3666e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Apr 2012 05:53:09 +0800
Tag:    v2.1.6

Merge branch 'wip-MDL-29678-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE

commit fcc24148d6024063fa8b29e1a312f9dbf28f3c84
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Apr 2012 05:52:32 +0800
Tag:    v2.2.3

Merge branch 'wip-MDL-29678-m22' of git://github.com/samhemelryk/moodle into MOODLE_22_STABLE

commit 6643e10f395b82ee77ffcc21d30daf3f219ba61b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Apr 2012 05:52:10 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-29678-m23' of git://github.com/samhemelryk/moodle

commit 46ed2f8b7fbaca1ca8b6e5e3494c687347ab9d71
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Apr 2012 03:17:58 +0800
Tag:    v2.3.0-beta

Merge branch 'w14_MDL-32251_m23_strict3' of git://github.com/skodak/moodle

commit ee72fe8881011835fdcfad87ddb8217f43500297
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Apr 2012 03:06:28 +0800
Tag:    v2.1.6

Merge branch 'wip-MDL-32018-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE

commit 8c6bc1e000ab347593290b6776ef61e0cab25ced
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Apr 2012 03:06:16 +0800
Tag:    v2.2.3

Merge branch 'wip-MDL-32018-m22' of git://github.com/samhemelryk/moodle into MOODLE_22_STABLE

commit 6c51c08b132bc7d7900e3f558b1b2d06b61162e0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Apr 2012 03:04:36 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-32018-m23' of git://github.com/samhemelryk/moodle

commit 539eb194b1dbfc798b8da59a5a55371fa98f2433
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 29 Mar 2012 19:20:25 +0800
Tag:    v2.1.6

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit cf6b626f39ee0a7618e9796866e05a3db7bf8960
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 29 Mar 2012 19:20:12 +0800
Tag:    v2.2.3

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit db5d8b66c056f0ffa9e0e528822113f6e1a60530
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 29 Mar 2012 19:19:59 +0800
Tag:    v2.3.0-beta

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit 3f0cb423b2fba1f0861cd506a86a4d95be820006
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 29 Mar 2012 04:49:38 +0800
Tag:    v2.3.0-beta

Merge branch 'w13_MDL-32095_m23_strict2' of git://github.com/skodak/moodle

commit 296c0247c6cc9e525721fc92b5a78c7146e6887d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 27 Mar 2012 16:10:17 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31914-master-4' of git://git.luns.net.uk/moodle

commit a176999cc5e9810ee19a70ed88eb224d95685947
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 27 Mar 2012 03:36:08 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32202' of git://github.com/stronk7/moodle

commit 43616f61f16af19a14f78d2c90986ecdf6e21a11
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 27 Mar 2012 01:40:58 +0800
Tag:    v2.3.0-beta

Merge branch 'w13_MDL-32112_m23_dbman' of git://github.com/skodak/moodle

commit 2151dfa877d811a28acfdfbc8c435e8de3abdeb6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 15 Mar 2012 18:42:33 +0800
Tag:    v2.0.9

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 197cd287711321236db4ddb7be1d645a8ca33029
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 15 Mar 2012 18:42:18 +0800
Tag:    v2.1.6

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit f51ba2033b64ed565b76b513d78480ab13347b78
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 15 Mar 2012 18:42:06 +0800
Tag:    v2.2.3

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit ef5d54ffbfa66fe911d7c02de5f1df02e16fac6c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 15 Mar 2012 18:41:55 +0800
Tag:    v2.3.0-beta

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit 3e59bbdbb73012a7dc84908b3c6d0654edf3f4d9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 15 Mar 2012 07:39:17 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-26243-master' of https://github.com/mackensen/moodle

commit 956d55e638a04699fe5fc3f55ecf56fe6438fbc4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 15 Mar 2012 01:07:21 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30995' of git://github.com/ankitagarwal/moodle

commit 9767526f88d01684a7fedc608461ab3612f828f5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 14 Mar 2012 06:40:39 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30616-master-7' of git://git.luns.net.uk/moodle

commit 4c31dfd14adc07f963f69d29fb7bc915c44d49f0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 14 Mar 2012 06:01:11 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-31929-master' of git://github.com/marinaglancy/moodle

commit f02702760afcee8e3f6107a77bae1719b58a92a7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 14 Mar 2012 05:35:04 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-27405-m23' of git://github.com/samhemelryk/moodle

commit b39877ef1030550223a98a71a41cfc758ebff791
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 14 Mar 2012 01:13:52 +0800
Tag:    v2.3.0-beta

Merge branch 'w11_MDL-31790_m23_resetunenrol' of git://github.com/skodak/moodle

commit b434431b38e3dbd1243d5a17db9ed29badc41067
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 14 Mar 2012 01:09:36 +0800
Tag:    v2.1.6

Merge branch 'MDL-31981_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit a7844302882ea7cd70c4f36fe2805d98760164ef
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 14 Mar 2012 01:09:24 +0800
Tag:    v2.2.3

Merge branch 'MDL-31981_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 9b89dc4f7df73858bb43f6bba73742145220f34d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 14 Mar 2012 01:08:40 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31981' of git://github.com/timhunt/moodle

commit 651cf35cbecd0941d9a71370712aac0b1ed62efb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 13 Mar 2012 23:17:14 +0800
Tag:    v2.1.6

Merge branch 'wip-MDL-31175-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE

commit 3da552e27c25ae5e8c9effd50cc1c551973b9c69
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 13 Mar 2012 23:16:18 +0800
Tag:    v2.2.3

Merge branch 'wip-MDL-31175-m22' of git://github.com/samhemelryk/moodle into MOODLE_22_STABLE

commit e4db653e3a7a79c3b7b8c17f178d65271314ea38
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 13 Mar 2012 23:15:02 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-31175-m23' of git://github.com/samhemelryk/moodle

commit 65fc03100dc5d13e7bb84e8d6ee880ff522c915c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 13 Mar 2012 20:36:48 +0800
Tag:    v2.3.0-beta

Merge branch 'w11_MDL-31845_m23_dbenrolcat' of git://github.com/skodak/moodle

commit 6014124ea3b514f49f812774d9acb771a8e906af
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 13 Mar 2012 20:14:48 +0800
Tag:    v2.2.3

Merge branch 'w11_MDL-31718_m22_shortentext' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 45c41bdc060b4e914435260b9752193cce4e4ea2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 13 Mar 2012 19:51:41 +0800
Tag:    v2.3.0-beta

Merge branch 'w11_MDL-31718_m23_shortentext' of git://github.com/skodak/moodle

commit 3ad6f443b42c541c4eac6bfb2950270e8e3337c7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 13 Mar 2012 07:35:19 +0800
Tag:    v2.2.3

Merge branch 'w11_MDL-31913_m22_tinymce' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit b20bb8454a81c429e7815d332d2bb3d568fb51f9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 13 Mar 2012 07:15:59 +0800
Tag:    v2.3.0-beta

Merge branch 'w11_MDL-31985_m23_lobsizes' of git://github.com/skodak/moodle

commit 403ff1b8ffc7ea4f4cd4ac044b351d4d96d8ed63
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 13 Mar 2012 06:16:27 +0800
Tag:    v2.3.0-beta

Merge branch 'w11_MDL-31899_m23_mysqlcolumns' of git://github.com/skodak/moodle

commit 8135ecf6e1312d035ab7e57fb3facfcc730defd1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 13 Mar 2012 04:37:18 +0800
Tag:    v2.1.6

Merge branch 'w11_MDL-31956_m21_paypal' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 0b1579b2d824f06e22d5bd18404fa7a7bfb38845
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 13 Mar 2012 04:37:01 +0800
Tag:    v2.2.3

Merge branch 'w11_MDL-31956_m22_paypal' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit e4ccd85f3a079b7332647cf6bc489d3d47fbc5d0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 13 Mar 2012 04:36:36 +0800
Tag:    v2.3.0-beta

Merge branch 'w11_MDL-31956_m23_paypal' of git://github.com/skodak/moodle

commit 39115a4fee1459ec86b5709c5b21968ad397b2da
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 13 Mar 2012 03:18:09 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31979-master' of git://github.com/micaherne/moodle

commit 89a47fcc4eea626cec2fafe52b676f99f793bd75
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 13 Mar 2012 01:04:55 +0800
Tag:    v2.3.0-beta

Merge branch 'w11_MDL-31805_m23_html2text' of git://github.com/skodak/moodle

commit 41c65d7d8e95ad2e07654bcb7e1585bbbd682f3d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 13 Mar 2012 01:01:21 +0800
Tag:    v2.1.6

Merge branch 'w11_MDL-31595_m21_enrolme' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 33d1075328db591dbdb7141f2fd2e56b8f1382dc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 13 Mar 2012 01:01:01 +0800
Tag:    v2.2.3

Merge branch 'w11_MDL-31595_m22_enrolme' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit f0131f57d91edbbd4edb830fd5656cb5c7271d03
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 13 Mar 2012 01:00:23 +0800
Tag:    v2.3.0-beta

Merge branch 'w11_MDL-31595_m23_enrolme' of git://github.com/skodak/moodle

commit 833af94c19a092b7ece410872cad267907edfd73
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 12 Mar 2012 23:34:28 +0800
Tag:    v2.1.6

Merge branch 'w11_MDL-31815_m21_confirmemail' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 3e6e265d1a5ad97db643497582e104e7395dcaa3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 12 Mar 2012 23:34:13 +0800
Tag:    v2.2.3

Merge branch 'w11_MDL-31815_m22_confirmemail' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit c9a16202d729e3fcbfcdb9426898c250fa91e16c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 12 Mar 2012 23:33:27 +0800
Tag:    v2.3.0-beta

Merge branch 'w11_MDL-31815_m23_confirmemail' of git://github.com/skodak/moodle

commit 3bc7584619b6183170a7581100e4b3010e15fd1d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 12 Mar 2012 22:49:41 +0800
Tag:    v2.1.6

Merge branch 'w11_MDL-31534_m21_pageinitroot' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 7fabd5af5c80ed4cbf9f9e3943fccb580f8eab52
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 12 Mar 2012 22:49:30 +0800
Tag:    v2.2.3

Merge branch 'w11_MDL-31534_m22_pageinitroot' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit ccd7a793eea714c298d524ccca64196305b46b5a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 12 Mar 2012 22:49:04 +0800
Tag:    v2.3.0-beta

Merge branch 'w11_MDL-31534_m23_pageinitroot' of git://github.com/skodak/moodle

commit 2d2dfae5e9e43f71723e7a0fa3a9ccd488d62352
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 12 Mar 2012 20:38:51 +0800
Tag:    v2.1.6

Merge branch 'w11_MDL-31494_m21_adodblink' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 13cd1994af2cee7f5acc06914fc693cc9902e9b4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 12 Mar 2012 20:38:40 +0800
Tag:    v2.2.3

Merge branch 'w11_MDL-31494_m22_adodblink' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit bf0233fb7b7679df13f96b1b1a9da0b8faeb0782
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 12 Mar 2012 20:38:30 +0800
Tag:    v2.3.0-beta

Merge branch 'w11_MDL-31494_m23_adodblink' of git://github.com/skodak/moodle

commit 05386929dee73e7c85bc34cb3d3c1b83b6fcdd70
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 12 Mar 2012 19:47:56 +0800
Tag:    v2.3.0-beta

Merge branch 'w11_MDL-29514_m23_enum' of git://github.com/skodak/moodle

commit 8ef54b14bc6cd421c4e8cee419b39a8f0a4c400d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 09 Mar 2012 18:57:01 +0800
Tag:    v2.0.8

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 90ba17e1b864bb466151723c9d607444ce425e45
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 09 Mar 2012 18:56:45 +0800
Tag:    v2.1.5

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 5f51b09aeca6b25d451eba4fafd8645a8e8bcfd6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 09 Mar 2012 18:56:33 +0800
Tag:    v2.2.2

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit 23778a4dfa96e801cb3c9e84a5860183d4bc52a6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 09 Mar 2012 18:56:22 +0800
Tag:    v2.3.0-beta

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit a0c01a21465843cb5d42fc078d8c01d2947ebcc2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 09 Mar 2012 18:04:37 +0800
Tag:    v2.0.8

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 331a5108dc0a91274904882b1109910f2110ae52
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 09 Mar 2012 18:04:22 +0800
Tag:    v2.1.5

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 9be61d94fd29b43ed2ae11b84b7520a930ab2518
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 09 Mar 2012 18:04:06 +0800
Tag:    v2.2.2

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit c5d5d911a0257cfe512a10ebe3c6890879025c54
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 09 Mar 2012 18:03:53 +0800
Tag:    v2.3.0-beta

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit b3391165f174f9f52dbf935d863745bd49b86795
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 09 Mar 2012 16:49:52 +0800
Tag:    v1.9.17

Merge branch 'wip-MDL-31248-MOODLE_19_STABLE-v3' of git://github.com/abgreeve/moodle into MOODLE_19_STABLE

commit f25d9a9f4d3e77703b6a7873783292e9db84c0c6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 09 Mar 2012 16:48:25 +0800
Tag:    v2.0.8

Merge branch 'wip-MDL-31248-MOODLE_20_STABLE-v3' of git://github.com/abgreeve/moodle into MOODLE_20_STABLE

commit f03c2cb038bc3eb00d451828fabc575e9bbc3971
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 09 Mar 2012 16:48:02 +0800
Tag:    v2.1.5

Merge branch 'wip-MDL-31248-MOODLE_21_STABLE-v3' of git://github.com/abgreeve/moodle into MOODLE_21_STABLE

commit c44c8eb96ba872907d90ef20ee1012fe967eb206
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 09 Mar 2012 16:46:35 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-31248-MOODLE_22_STABLE-v3' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit e45cad3e5e991a11e60192bc846fd53f4683f210
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 09 Mar 2012 16:44:30 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-31248-master-v3' of git://github.com/abgreeve/moodle

commit f194dcf46a0345b60b1772e8e9aa90b4d125f455
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 08 Mar 2012 09:42:01 +0800
Tag:    v2.0.8

Merge branch 'wip-MDL-31248-MOODLE_20_STABLE-v2' of git://github.com/abgreeve/moodle into MOODLE_20_STABLE

commit c76aa441b44e13d67bd4ba962597b983eb60b337
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 08 Mar 2012 09:41:45 +0800
Tag:    v2.1.5

Merge branch 'wip-MDL-31248-MOODLE_21_STABLE-v2' of git://github.com/abgreeve/moodle into MOODLE_21_STABLE

commit 4b3d540f21437dda2e5be5c20cc475956d708379
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 08 Mar 2012 09:32:31 +0800
Tag:    v2.1.5

Merge branch 'wip-MDL-29086-MOODLE_21_STABLE' of git://github.com/abgreeve/moodle into MOODLE_21_STABLE

commit 1312ff87403b63bdf3e22e4f9ce978d6496020ee
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 08 Mar 2012 09:28:41 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-31248-MOODLE_22_STABLE-v2' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit 2583b7d22f31fa2bdabbe9456a12ae352ef05368
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 08 Mar 2012 09:27:55 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-31248-master-v2' of git://github.com/abgreeve/moodle

commit 26158557130f602ef49560bc5c6f17369d30de31
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 08 Mar 2012 07:48:22 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-29086-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit 427ad4d3c3abb713b43554058fc3d3410dd88bbe
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 08 Mar 2012 07:48:04 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-29086-master' of git://github.com/abgreeve/moodle

commit e233175df15fc55042f3683805d8f4600e1c3631
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 08 Mar 2012 04:41:36 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-30991-master' of git://github.com/phalacee/moodle

commit 87ab86d1cb141e84c5b5d9824d7505ec59e51252
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 08 Mar 2012 01:15:10 +0800
Tag:    v2.1.5

Merge branch 'wip-mdl-31894-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit 15c49dc35f11fad2bc6859c804feb78863ecd735
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 07 Mar 2012 22:42:21 +0800
Tag:    v2.1.5

Merge branch 'MDL-31712_M21' of git://github.com/kordan/moodle into MOODLE_21_STABLE

commit c904abc752eda4093d235c6732491157b8770273
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 07 Mar 2012 22:40:50 +0800
Tag:    v2.2.2

Merge branch 'MDL-31712_M22' of git://github.com/kordan/moodle into MOODLE_22_STABLE

commit f1662409a0dd395717ffc0ea891bea38908ca6e2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 07 Mar 2012 22:39:01 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31712_master' of git://github.com/kordan/moodle

commit bab29cb50b7c1c102a50d9d9948d3e8716a92397
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 07 Mar 2012 11:01:53 +0800
Tag:    v2.1.5

Merge branch 'MDL-28364_21' of git://github.com/jonof/moodle into MOODLE_21_STABLE

commit 5da8f5d11ea88f8af6a9cc3270ba52980d011232
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 07 Mar 2012 11:01:09 +0800
Tag:    v2.2.2

Merge branch 'MDL-28364_22' of git://github.com/jonof/moodle into MOODLE_22_STABLE

commit 12c5685a509e52cb014324ae21d6fe625ac61f36
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 07 Mar 2012 10:55:53 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-28364' of git://github.com/jonof/moodle

commit 4651c2d214feb4419c43338371dddc9bc89a1aca
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 07 Mar 2012 09:10:40 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30996-master' of git://github.com/ankitagarwal/moodle

commit 8650e13f9b0b6377310232c597acbea4a4aa0ec4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 07 Mar 2012 08:22:54 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-23787-master' of git://github.com/marinaglancy/moodle

commit bb77ead0a455404b35d354970c26dcd99972524c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 07 Mar 2012 07:18:27 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31255-master-3' of git://git.luns.net.uk/moodle

commit 7a4eb4ad3a347b1b64ada53788ba64bbd6737bb9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 07 Mar 2012 04:30:25 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31876-question_has_capability_on-memory-bloat' of git://github.com/dhg-atarplpl/moodle

commit 7f8c780dd36898b8077f5f49f7e7a1b0738a246a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 07 Mar 2012 04:23:54 +0800
Tag:    v2.1.5

Merge branch 'MDL-31829_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit a9b03dc66185ee727d800865e3519fb9d2632a80
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 07 Mar 2012 04:23:44 +0800
Tag:    v2.2.2

Merge branch 'MDL-31829_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit f1fbdbea3301e367628ae6ab51bf0d93f0d8b646
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 07 Mar 2012 04:18:04 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31829' of git://github.com/timhunt/moodle

commit 55957253d2cc43275f0b03211ca1870837cbc229
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 07 Mar 2012 04:10:02 +0800
Tag:    v2.3.0-beta

Merge branch 'w10_MDL-31079_m23_minifydebug' of git://github.com/skodak/moodle

commit 2ed7cc27305e8f7f320832864f1bff8afc89d70d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 06 Mar 2012 23:06:53 +0800
Tag:    v2.3.0-beta

Merge branch 'w10_MDL-31301_m23_textlibcleanup' of git://github.com/skodak/moodle

commit 050bce5f0ceb28a50d8d4879c29d199a88d50751
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 06 Mar 2012 22:38:29 +0800
Tag:    v2.3.0-beta

Merge branch 'w10_MDL-31361_m23_dbunenrol' of git://github.com/skodak/moodle

commit c5e3e165b1a9189dacf30281bd8dc8c2a2638602
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 06 Mar 2012 20:35:40 +0800
Tag:    v2.3.0-beta

Merge branch 'w10_MDL-30636_m23_tinymce' of git://github.com/skodak/moodle

commit 0b9c121a8c5fb69a575cb724d556e7986c358d9a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 06 Mar 2012 20:12:23 +0800
Tag:    v2.1.5

Merge branch 'w10_MDL-31785_m21_htmlpurifier' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit fc7776f50ac23c8d0540d07470d0a39df350d73f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 06 Mar 2012 20:11:41 +0800
Tag:    v2.2.2

Merge branch 'w10_MDL-31785_m22_htmlpurifier' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit ea5740a821c7010e4a0f1eb7d3cba9a2052e6333
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 06 Mar 2012 20:01:39 +0800
Tag:    v2.3.0-beta

Merge branch 'w10_MDL-31785_m23_htmlpurifier' of git://github.com/skodak/moodle

commit cb8da175b73129ccfbe35e32a1a4eeb14c7c2f67
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 01 Mar 2012 18:26:36 +0800
Tag:    v2.0.8

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 05acc0c507d242755d26e25503ad07c1e31dc0c2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 01 Mar 2012 18:26:22 +0800
Tag:    v2.1.5

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit e8681669bc11d37bf06c7ad985c1cc0567badd9d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 01 Mar 2012 18:26:02 +0800
Tag:    v2.2.2

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit 8b4485c3865e97cfe96487366e395ef33442298f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 01 Mar 2012 18:25:29 +0800
Tag:    v2.3.0-beta

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit eaf7533fc179d74cc0c4610ffed1b731e4920c09
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 01 Mar 2012 08:07:33 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-30985-m23' of git://github.com/samhemelryk/moodle

commit d8c9ff403b5363f0167603673ed3a5ab2755dff9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 01 Mar 2012 07:25:18 +0800
Tag:    v2.3.0-beta

Merge branch 's17_MDL-30973_file_docblock_master' of git://github.com/dongsheng/moodle

commit b6ea2779c6df2fe7f9c9e3f115afa8e8b9af1358
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Feb 2012 09:19:40 +0800
Tag:    v2.1.5

Merge branch 'wip-mdl-29274-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit f2a6db61a9969ac41fec91c5acee395fdca4f6c6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Feb 2012 09:19:19 +0800
Tag:    v2.2.2

Merge branch 'wip-mdl-29274-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit d5d9d96ab4d5bde9620220293a57631d9100a45e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Feb 2012 09:13:46 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-29274' of git://github.com/rajeshtaneja/moodle

commit 0915af2783840a295787b93aae553edd9e8f0225
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Feb 2012 09:11:08 +0800
Tag:    v2.1.5

Merge branch 'MDL-31748_M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit 3716fb55e103697caacda4cd3db4fc33a4b5d0bc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Feb 2012 09:10:48 +0800
Tag:    v2.2.2

Merge branch 'MDL-31748_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit 70bdf17ea2cf7ea5456612ea39b41d38576c266b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Feb 2012 09:09:43 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31748_master' of git://github.com/lazydaisy/moodle

commit 85c0bc886b8c7619385ab566a71cf6e966c1b0a9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Feb 2012 09:06:40 +0800
Tag:    v2.1.5

Merge branch 'MDL-26496_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit cafbb73f5b8773877cd6e077e626d6a931772398
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Feb 2012 09:06:07 +0800
Tag:    v2.2.2

Merge branch 'MDL-26496_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit c3592ba7fa0f31e28f8dd2f7dc8df61914480969
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Feb 2012 09:04:59 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-26496' of git://github.com/rwijaya/moodle

commit 86c4c9e8f81434360bb572408c1ce5571b639d7c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Feb 2012 08:47:10 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31351_master' of git://github.com/lazydaisy/moodle

commit d0d5fd36e6dc308dc8c2013c2eaa1e832ad34b8f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Feb 2012 07:52:51 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-30976-master' of git://github.com/abgreeve/moodle

commit 1f256ec5ca44048b3b020065a45ddde40bba0e1a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Feb 2012 07:47:10 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30982-docblock-backup' of git://github.com/mudrd8mz/moodle

commit 05bfd9ff6fd8545098a69fe78bb69aa89db1c9e6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Feb 2012 07:30:49 +0800
Tag:    v2.1.5

Merge branch 'wip-MDL-31738-MOODLE_21_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_21_STABLE

commit 46ccd8b12bc44b56b01d64fb386fffb27146413d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Feb 2012 07:30:27 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-31738-MOODLE_22_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_22_STABLE

commit 24ff971106ba77c6ebd81d058c25c14ce9dc0a6d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Feb 2012 07:29:23 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-31738-master' of git://github.com/marinaglancy/moodle

commit 309d7a0c1be86b46222900bc0fdd6cbe343b66f6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Feb 2012 04:14:20 +0800
Tag:    v2.3.0-beta

Merge branch 'wip_m_MDL-29178_fix_block_naming_inconsistencies' of git://github.com/gerrywastaken/moodle

commit ed27a82dbcd05a50f8832130a3ef033b6ca89b9c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Feb 2012 00:34:23 +0800
Tag:    v2.1.5

Merge branch 'MDL-25027_stable_consistency_fix_m21' of git://github.com/nebgor/moodle into MOODLE_21_STABLE

commit 313f98c88a72d6a37eb34dbfde6dbabe3c820b47
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Feb 2012 00:34:12 +0800
Tag:    v2.2.2

Merge branch 'MDL-25027_stable_consistency_fix_m22' of git://github.com/nebgor/moodle into MOODLE_22_STABLE

commit 64f0293fe20e7f9f8929b40f672678c6ac4a7567
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Feb 2012 00:33:56 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-25027_stable_consistency_fix' of git://github.com/nebgor/moodle

commit dde82858b8e6532fa1cbea687e925f97120a7387
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Feb 2012 19:44:03 +0800
Tag:    v2.3.0-beta

Merge branch 'w09_MDL-30964_m23_access' of git://github.com/skodak/moodle

commit cee44e2d96be1e23abf02350b36bfdf9a073b72d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Feb 2012 19:37:44 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31363_grade_constants' of git://github.com/andyjdavis/moodle

commit 18e9464448d50e5f4bbbc2408093d1c6cfeab2cf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Feb 2012 10:53:05 +0800
Tag:    v2.1.5

Merge branch 'MDL-27793_m21' of git://github.com/nebgor/moodle into MOODLE_21_STABLE

commit e61fabb720bc6a01e775a1bacfbed0ad41cb475b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Feb 2012 10:52:53 +0800
Tag:    v2.2.2

Merge branch 'MDL-27793_m22' of git://github.com/nebgor/moodle into MOODLE_22_STABLE

commit 96eccb7517ddba11076c7ee72bff357778e263fc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Feb 2012 10:29:33 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-27793' of git://github.com/nebgor/moodle

commit 2f69c6159bd95ef79f5e57ade4d791545e48488c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Feb 2012 05:22:09 +0800
Tag:    v2.1.5

Merge branch 'MDL-29161_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit aaa24bb35cb710a590b24baa8735fbf833a56784
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Feb 2012 05:21:50 +0800
Tag:    v2.2.2

Merge branch 'MDL-29161_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 6c941fc10f2ef103934b4accf9702634f7d76e44
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Feb 2012 05:10:47 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29161' of git://github.com/timhunt/moodle

commit 89c8b0a8c0fcb4c8d1309d90bd1e3d1ebc7f9b4d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Feb 2012 05:07:01 +0800
Tag:    v2.1.5

Merge branch 'MDL-31721_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 0c93bbde9e9bc843e4e50774eed69731ee51b9b8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Feb 2012 05:06:46 +0800
Tag:    v2.2.2

Merge branch 'MDL-31721_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit bea0a6f5eb765561b04b17dd1f372792325d27bc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Feb 2012 05:05:56 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31721' of git://github.com/timhunt/moodle

commit 7c330ad77d8d3483b5f36740197bf3c02cd4d354
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Feb 2012 02:02:59 +0800
Tag:    v2.1.5

Merge branch 'MDL-31729_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit bd4b665ed6e03d9523d2ae295dcbff4c9ed2bf60
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Feb 2012 02:02:42 +0800
Tag:    v2.2.2

Merge branch 'MDL-31729_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 869f80e4f32486565005dd89fc70d4a9dad2864d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Feb 2012 02:01:34 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31729' of git://github.com/timhunt/moodle

commit 82f4e1f838bb4cc681e1a6dec5ff97a5e25dfc17
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Feb 2012 01:55:05 +0800
Tag:    v2.1.5

Merge branch 'MDL-29256-resource-format_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit edb03ff65b5afc63fce275bb9a30fd2297470ef7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Feb 2012 01:54:35 +0800
Tag:    v2.2.2

Merge branch 'MDL-29256-resource-format_22_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_22_STABLE

commit 516b956a28f81a0fd0ca1b8f1dfdd537a6e3bc29
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Feb 2012 01:53:03 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29256-resource-format' of git://github.com/mudrd8mz/moodle

commit 8e53b911e7bba0a98c2e50dbc2e6fe98c9652cf2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Feb 2012 01:48:18 +0800
Tag:    v2.1.5

Merge branch 'MDL-29199-21_STABLE' of git://github.com/danpoltawski/moodle into MOODLE_21_STABLE

commit 98e9b0f21e4213fee4a3e3aad2e4318ca6444ee6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Feb 2012 01:47:51 +0800
Tag:    v2.2.2

Merge branch 'MDL-29199' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit 92f901158f1c6c21b1bad809a15826644182482a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Feb 2012 01:47:12 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29199-master' of git://github.com/danpoltawski/moodle

commit 515acf79147b12047a17b24e72064b2d0b221cfe
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Feb 2012 00:07:24 +0800
Tag:    v2.2.2

Merge branch 'MDL-29229' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit 8774bde1a9f9b0ea5e97928bd6781c03cc4f4198
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Feb 2012 23:52:57 +0800
Tag:    v2.1.5

Merge branch 'MDL-29523-21_STABLE' of git://github.com/danpoltawski/moodle into MOODLE_21_STABLE

commit 1415ba23190eb52e1215727d8be084104dfda019
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Feb 2012 23:51:54 +0800
Tag:    v2.2.2

Merge branch 'MDL-29523' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit ec1956655a14db1142bc67e2bf2424a2b392180c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Feb 2012 23:51:44 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29523-master' of git://github.com/danpoltawski/moodle

commit bcf5427193a638d60214ef9bcdbb404581a31258
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Feb 2012 23:06:19 +0800
Tag:    v2.2.2

Merge branch 'MDL-29592' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit 0d40a799e5d090f6f22069705fadb97d385459a6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Feb 2012 22:57:09 +0800
Tag:    v2.2.2

Merge branch 'MDL-31348' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit 6c200e966f887d11148433d63a101959d4ab17be
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Feb 2012 22:44:48 +0800
Tag:    v2.1.5

Merge branch 'MDL-31546-21_STABLE' of git://github.com/danpoltawski/moodle into MOODLE_21_STABLE

commit 5775c7ec63554a329056437b195e589d5af55b32
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Feb 2012 22:44:28 +0800
Tag:    v2.2.2

Merge branch 'MDL-31546' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit 4c5c7b13011d4032412ebb19b2ee41ad582cbd8b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Feb 2012 22:44:11 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31546-master' of git://github.com/danpoltawski/moodle

commit 4f3b7b7df3caba99515c520f88ae7af26c73dedc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Feb 2012 18:35:21 +0800
Tag:    v2.0.8

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 0938a8847fb76eee679a22af55153cae01c21ae5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Feb 2012 18:35:08 +0800
Tag:    v2.1.5

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 17d8e3ec8a824db75102b10b64d3a23771904ccd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Feb 2012 18:34:52 +0800
Tag:    v2.2.2

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit 5e6e0a11234949e23cf2cd40905baa81db6824c7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Feb 2012 18:34:35 +0800
Tag:    v2.3.0-beta

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit 202c72c997f3e9ef4248f1277622439785138d88
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Feb 2012 20:09:54 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-30997-master' of git://github.com/abgreeve/moodle

commit e9adc4057fc19119b6175841e627439159810162
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Feb 2012 17:07:47 +0800
Tag:    v2.1.5

Merge branch 'm21_MDL-31652' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit d5ae248cb991472557becb45bf61866fca6f2b9d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Feb 2012 04:20:07 +0800
Tag:    v2.1.5

Merge branch 'wip-MDL-30830-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE

commit 7b1890513f0ed446bffad43b644787a46e4b60a8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Feb 2012 04:19:33 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-30830-m22' of git://github.com/samhemelryk/moodle into MOODLE_22_STABLE

commit af7ee420f467d713bec5a7652e37072f32772b24
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Feb 2012 04:11:15 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-30830-m23' of git://github.com/samhemelryk/moodle

commit c85e0f6e1e5e29f9fc3ad55c3df6f0abb76fb163
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Feb 2012 17:48:50 +0800
Tag:    v2.1.5

Merge branch '21_MDL-25996_making_language_editing_terms_user_friendly' of git://github.com/gerrywastaken/moodle into MOODLE_21_STABLE

commit 52f37a943c804be88b3b30836e4ad71c803984e7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Feb 2012 17:48:20 +0800
Tag:    v2.2.2

Merge branch '22_MDL-25996_making_language_editing_terms_user_friendly' of git://github.com/gerrywastaken/moodle into MOODLE_22_STABLE

commit 25f51decaed90e0c6ec8168daa6f832cc59c414b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Feb 2012 17:47:37 +0800
Tag:    v2.3.0-beta

Merge branch 'm_MDL-25996_making_language_editing_terms_user_friendly' of git://github.com/gerrywastaken/moodle

commit 8c4988cd3b95ed8bd7d872842544e378e5026b8e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Feb 2012 09:30:14 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31561' of git://github.com/kiklop74/moodle

commit a96fb50192e913fee45d70bd0d1e9d47b2ef8b94
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Feb 2012 09:28:14 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31562' of git://github.com/kiklop74/moodle

commit 7b98cbf20e83461250ead0f3214ceddc89e3a9a5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Feb 2012 09:10:38 +0800
Tag:    v2.1.5

Merge branch 'wip-mdl-25432-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit 894c5e0b86065428d1f296a3dcd6628880727301
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Feb 2012 09:10:29 +0800
Tag:    v2.2.2

Merge branch 'wip-mdl-25432-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit f4319f8531a0c001caa434d9b0b1b445a42f8d91
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Feb 2012 09:10:10 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-25432' of git://github.com/rajeshtaneja/moodle

commit c3ca963d8169b35cccca2b5cdd467933c2309c75
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Feb 2012 08:43:53 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30698_multiple_emails' of git://github.com/andyjdavis/moodle

commit 6ff5994b496249e3fa086c94adbd31effb5535ef
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Feb 2012 00:11:22 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-19421-master-3' of git://git.luns.net.uk/moodle

commit 896f9739ccdb36085d13e7fe39a95f7426fbab58
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Feb 2012 22:40:16 +0800
Tag:    v2.1.5

Merge branch 'MDL-31345_M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit 9b228afffe62ff7c5182bbfdfa323ed799654d80
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Feb 2012 22:40:02 +0800
Tag:    v2.2.2

Merge branch 'MDL-31345_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit 9cd8e48ca671b3da34d4d881411f91fd687799b6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Feb 2012 22:34:31 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31345_master' of git://github.com/lazydaisy/moodle

commit 50a1fe7b13a681d3d6e449e25628154636c9f334
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Feb 2012 19:59:20 +0800
Tag:    v2.1.5

Merge branch 'wip-MDL-25299-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE

commit f24d063a5e916cedcf9be9683cf27d90e2682d81
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Feb 2012 19:59:11 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-25299-m22' of git://github.com/samhemelryk/moodle into MOODLE_22_STABLE

commit d03a13045519ed1ba4af379866affe1e4943ad86
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Feb 2012 19:58:54 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-25299-m23' of git://github.com/samhemelryk/moodle

commit 2a5fa9e64a652fc74ea893bce642a297a6f56a74
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Feb 2012 19:02:18 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30999_grade_phpdocs' of git://github.com/andyjdavis/moodle

commit a0fbb0a270d39a14d4fb2d5a3f1060fd6ca571aa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Feb 2012 18:38:20 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-30979-m23' of git://github.com/samhemelryk/moodle

commit 7dca125be46bd8d007de850fe6d638ff524a649a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Feb 2012 18:25:01 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-30977-m23' of git://github.com/samhemelryk/moodle

commit ad360e66aeacaf8f3191f92fa0ce17d68e2d77e6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Feb 2012 18:20:21 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30972_final' of git://github.com/nebgor/moodle

commit 85cb510aba8434c1b945b3006e8fd17682293fa1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 17 Feb 2012 08:44:20 +0800
Tag:    v2.0.8

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 72700fd59309cdc4f6e87875ccf069722ee11e41
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 17 Feb 2012 08:43:56 +0800
Tag:    v2.1.5

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit cad211198a3115d35facf818257cb1066e44e552
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 17 Feb 2012 08:43:38 +0800
Tag:    v2.2.2

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit d764c275f2252ee9ebe2ac00d3b9ef90b44c4753
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 17 Feb 2012 08:43:19 +0800
Tag:    v2.3.0-beta

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit ec93cd94e8298069044a06f892581ecfd85887af
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 16 Feb 2012 09:07:48 +0800
Tag:    v2.3.0-beta

Merge branch 's17_MDL-30984_comment_docblock_master' of git://github.com/dongsheng/moodle

commit 1991f37f55d6b9fce68f1ff276989516863e4bd2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Feb 2012 10:19:44 +0800
Tag:    v2.3.0-beta

Merge branch 'm_MDL-31552_change_add_to_log_exception_to_add_exception_information' of git://github.com/gerrywastaken/moodle

commit 746aa0ba162302e71133ba3a09fc5df540f27ad2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Feb 2012 10:14:58 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31386-master-1' of git://git.luns.net.uk/moodle

commit 32d4d0d1ce791b7ff6c83eb96cf7ac6965584e51
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Feb 2012 20:12:44 +0800
Tag:    v2.2.2

Merge branch 'MDL-30126-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit 8ea8291f93891065cc112eac2dba219f46c1cfc1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Feb 2012 20:12:07 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30126' of git://github.com/mouneyrac/moodle

commit 3210eeef50d5041cd0d049ca2f7b5b106e224a65
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Feb 2012 19:11:49 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31527_xmldb_table_names' of git://github.com/davosmith/moodle

commit 35d8759a0573c988395d21f87879a524265bfbb2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Feb 2012 07:53:09 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30975' of git://github.com/ankitagarwal/moodle

commit 88e959afe54fa39ac3adfa4466a031cdb46a406d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Feb 2012 06:37:34 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31251' of git://github.com/nebgor/moodle

commit a72cf89d5ef25d77261bd6efd4f4a15c545d825a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 13 Feb 2012 08:14:51 +0800
Tag:    v2.2.2

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit f3fb0e775e8e068f0453cfa883799f31380f28dc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 09 Feb 2012 00:04:53 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30983' of git://github.com/rwijaya/moodle

commit 722b55dd16ab53c1f1fb580c4799b9bd5759a218
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Feb 2012 20:18:49 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-30980' of git://github.com/rajeshtaneja/moodle

commit 658a15bd31d3be350b9825fae3ca01f982486775
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Feb 2012 18:45:07 +0800
Tag:    v2.1.5

Merge branch 'MDL-27891-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit 948a4d8c941a2f4de9183fc6c2484db4566a1cf5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Feb 2012 18:44:19 +0800
Tag:    v2.2.2

Merge branch 'MDL-27891-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit fd1981aea7838f6f83c817dd68e015cb62dd2af1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Feb 2012 18:36:21 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-27891-master' of git://github.com/ankitagarwal/moodle

commit 23666489f733fd1affb18ae88e272db72918e576
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Feb 2012 18:17:45 +0800
Tag:    v2.1.5

Merge branch 'MDL-31345_M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit 2ffd822e63c13c2dcb73f200021e2581694de51f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Feb 2012 18:17:26 +0800
Tag:    v2.2.2

Merge branch 'MDL-31345_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit 4b192ea03920efd3458668286fb10980cc8dd366
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Feb 2012 18:13:53 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31345_master' of git://github.com/lazydaisy/moodle

commit 82b07ee7d39894bc9c7008a941b89a7b58b47bef
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Feb 2012 18:07:55 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31316-master-4' of git://git.luns.net.uk/moodle

commit 4278e96007f1f02e76147a2cf78ff48c8b3a19dd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Feb 2012 10:38:53 +0800
Tag:    v2.1.5

Merge branch 'MDL-29892_overview_hidden_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit 47475df5274828e831de13d48a0d9f56c8ef0979
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Feb 2012 10:38:44 +0800
Tag:    v2.2.2

Merge branch 'MDL-29892_overview_hidden_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 24775c922c74241b4194a344f5101f2fb766afd7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Feb 2012 10:38:36 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29892_overview_hidden' of git://github.com/andyjdavis/moodle

commit 493e4f8571f5f94a989d5c6789378a45c2f91ee6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Feb 2012 09:38:01 +0800
Tag:    v2.1.5

Merge branch 'MDL-30722_forum_unsubscribe_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit 76456cf5f247a75715317bba3bc6a24e6253a94b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Feb 2012 09:37:46 +0800
Tag:    v2.2.2

Merge branch 'MDL-30722_forum_unsubscribe_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit f380b7a80b373eb5e6ad64cf59c9d4019873564c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Feb 2012 09:37:11 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30722_forum_unsubscribe' of git://github.com/andyjdavis/moodle

commit 6fe3c3907b9fc55c822f4e9fd3c6336717946fff
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Feb 2012 08:18:09 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-30540-stable22' of git://github.com/phalacee/moodle into MOODLE_22_STABLE

commit ae8c201905963b1bfcf3c6007a4d1a2a328f7950
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Feb 2012 08:17:51 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-30540-master' of git://github.com/phalacee/moodle

commit 1fa6e5df98cde961eaf6703ef219366f1c5b445f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Feb 2012 07:53:33 +0800
Tag:    v2.1.5

Merge branch 'MDL-26384-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit 16f5ffacd44afbf490122c8bacb6b8fc2980568a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Feb 2012 07:53:15 +0800
Tag:    v2.2.2

Merge branch 'MDL-26384-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit e80898b52553f21d40fe4ab0d781320828cd56bb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Feb 2012 07:48:32 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-26384-master' of git://github.com/ankitagarwal/moodle

commit de655be9ca432c2b5ae313b64c77b11d76853a79
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Feb 2012 06:49:33 +0800
Tag:    v2.1.5

Merge branch 'MDL-27360-MOODLE_21_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_21_STABLE

commit c2db2793d20c116cd78188869a3d306373200306
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Feb 2012 06:49:19 +0800
Tag:    v2.2.2

Merge branch 'MDL-27360-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit 1208c6bb72759aa11e0e19ef595acc4c6d2aaea2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Feb 2012 06:49:01 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-27360' of git://github.com/mouneyrac/moodle

commit 357274c6b9936aa89ae3a89c73099759401984a6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Feb 2012 05:41:39 +0800
Tag:    v2.2.2

Merge branch 'm22_MDL-31374' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit 18a727e6fd9d281384b9041cd0877a0cabafbf5e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 02 Feb 2012 19:08:48 +0800
Tag:    v2.2.2

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit 26ed4e73ebdc80f25d77756644158d4de5f852bd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 Feb 2012 20:17:08 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29615_control_override_email2' of git://github.com/andyjdavis/moodle

commit e691a270a9343a596c7d00668334988ac3d1b5f9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 Feb 2012 08:03:21 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31267' of git://github.com/epsd/moodle

commit 8837d68be527af11d08b2aded0238dd130d1e748
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 Feb 2012 07:54:28 +0800
Tag:    v2.1.5

Merge branch 'wip-MDL-31160-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE

commit be15c303e0e868cf84e43a77fc124c3c39ebe24f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 Feb 2012 07:54:14 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-31160-m22' of git://github.com/samhemelryk/moodle into MOODLE_22_STABLE

commit 6ad5968d6817db638f3bc576fc53a6d72305296c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 Feb 2012 07:53:16 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-31160-m23' of git://github.com/samhemelryk/moodle

commit 5acb97c505dd144f552341252c9262af044c4af7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 Feb 2012 07:50:59 +0800
Tag:    v2.1.5

Merge branch 'wip-MDL-31197-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE

commit acef9e8a7f2ac3133aefc806c47db35cfc114cc5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 Feb 2012 07:50:38 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-31197-m22' of git://github.com/samhemelryk/moodle into MOODLE_22_STABLE

commit 9a7e63128a2cb909b868c9c78fd95244bf5822ff
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 Feb 2012 07:48:47 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-31197-m23' of git://github.com/samhemelryk/moodle

commit 6badc27a661aa0f5ca8ff9f8eddd3ca12ca25319
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 Feb 2012 07:41:47 +0800
Tag:    v2.2.2

Merge branch 'm22_MDL-31039' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit 94a0c9746447d1f2f27662e282d761c810ddd73c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 Feb 2012 07:41:25 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-31039' of git://github.com/danmarsden/moodle

commit 8aac56c6be11dba49ed8be004a48a8744270f6cb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 Feb 2012 07:25:05 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31000-master-3' of git://git.luns.net.uk/moodle

commit a14e3f274e078c978c7bd961440aae720eec81c9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 Feb 2012 06:57:32 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31448_incorrect-comment' of https://github.com/ncsu-delta/moodle

commit c0ffe9a29862cf08e12ffd6bab0f870c0cd18de9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 Feb 2012 06:03:16 +0800
Tag:    v2.1.5

Merge branch 'MDL-31015-m21' of git://github.com/sammarshallou/moodle into MOODLE_21_STABLE

commit f22c2e015a1d63e6d683d7f8d4e6f25a28bdf7e1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 Feb 2012 06:02:56 +0800
Tag:    v2.2.2

Merge branch 'MDL-31015-m22' of git://github.com/sammarshallou/moodle into MOODLE_22_STABLE

commit 008bf7f0aca2265c599e331d9cd75faaf98de953
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 Feb 2012 02:44:21 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31015-master' of git://github.com/sammarshallou/moodle

commit d6e08b3e74b1fb783eb32fd31f721071e28ba903
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 Feb 2012 02:38:57 +0800
Tag:    v2.1.5

Merge branch 'MDL-30854_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit d4184875ce9ecc5720be113a56a4dd7b982ef3d0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 Feb 2012 02:38:48 +0800
Tag:    v2.2.2

Merge branch 'MDL-30854_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit ba353742ce0fb45da1064212dbbe51417a9bf5e8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 Feb 2012 02:30:58 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30854' of git://github.com/timhunt/moodle

commit 764525a02c4bb51c926997e1c83b65dea1dce949
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 Feb 2012 00:17:05 +0800
Tag:    v2.1.5

Merge branch 'MDL-30484_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 26be1bf17a3f608712759724283c592554c972fd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 Feb 2012 00:16:51 +0800
Tag:    v2.2.2

Merge branch 'MDL-30484_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 7ce92ac1ad95c0ed4d4a8681673db08700d9cfa7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 Feb 2012 00:16:04 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30484' of git://github.com/timhunt/moodle

commit 7769c0f2f8a8581e0d15bcadec6b405e3ee0ebc5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 Feb 2012 00:06:26 +0800
Tag:    v2.1.5

Merge branch 'MDL-31314_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 5a1e6f2a6c4545a46de66dfb4d69a9d08bea55df
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 Feb 2012 00:06:14 +0800
Tag:    v2.2.2

Merge branch 'MDL-31314_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit ade31f5f4ffc1ae7c5a5ceeb4f70ff9e650028f5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 Feb 2012 00:06:01 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31314' of git://github.com/timhunt/moodle

commit b5f59f54da4009fff3e5be55873217dcfbfa21b1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 27 Jan 2012 09:21:21 +0800
Tag:    v2.0.8

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 15d767e0190f76fee336b5e7c6cef3cd9b715f6c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 27 Jan 2012 09:20:38 +0800
Tag:    v2.1.5

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 61622d9709ee101c6a5440c92df3d38cce6dad25
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 27 Jan 2012 09:20:16 +0800
Tag:    v2.2.2

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit cba018a30b97df00e216403a196f44cc53d85861
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 27 Jan 2012 09:19:05 +0800
Tag:    v2.3.0-beta

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit 19967a153eff281bf0896f6ede0e2449e82cdb5d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Jan 2012 08:52:53 +0800
Tag:    v2.1.5

Merge branch 'MDL-31122-m21' of git://github.com/sammarshallou/moodle into MOODLE_21_STABLE

commit b292cea475d1d0a3a2b7dbf67cd56782b14f0230
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Jan 2012 08:52:36 +0800
Tag:    v2.2.2

Merge branch 'MDL-31122-m22' of git://github.com/sammarshallou/moodle into MOODLE_22_STABLE

commit f8b8abcc5542529b7abfc344dca267fecbc51e6f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Jan 2012 08:52:25 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31122-master' of git://github.com/sammarshallou/moodle

commit 8300d8894ce5d843b72ad127ce0d333f9f812816
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Jan 2012 08:40:20 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31121-master' of git://github.com/sammarshallou/moodle

commit fe3130a07d05c43df7c1b7dd7de6de052f16471d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Jan 2012 08:17:06 +0800
Tag:    v2.2.2

Merge branch 'MDL-29896-m22' of git://github.com/sammarshallou/moodle into MOODLE_22_STABLE

commit 00a4543c5b5482bdeea39f543614c636ad47955e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Jan 2012 08:16:49 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29896-master' of git://github.com/sammarshallou/moodle

commit 312e45e6f6d7776f9062a7f8a82e1f8bbc79caed
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Jan 2012 08:07:27 +0800
Tag:    v2.1.5

Merge branch 'MDL-31113_multiple_files_file_manager_21' of https://github.com/davosmith/moodle into MOODLE_21_STABLE

commit 264189da87a0bde3a7acb66fc9d3d2a8bb423215
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Jan 2012 08:06:56 +0800
Tag:    v2.2.2

Merge branch 'MDL-31113_multiple_files_file_manager_22' of https://github.com/davosmith/moodle into MOODLE_22_STABLE

commit 478ba353b0dd6ca999a9afb27b1855b4ff942827
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Jan 2012 08:06:00 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31113_multiple_files_file_manager' of https://github.com/davosmith/moodle

commit 897e14e263bbac535e3faa0a8fa5a548ec288233
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Jan 2012 0