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

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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 f69ad213c06fce708b1f38b1a95fd960c43c8ac8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Jan 2012 19:26:09 +0800
Tag:    v2.1.5

Merge branch 'w04_MDL-31183_m21_gloscounts' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit d03f27f9f4df0b0673f4c49db1155727431c8539
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Jan 2012 08:30:16 +0800
Tag:    v2.1.5

Merge branch 'w04_MDL-31176_m21_groupcontext' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit b5c2f105677822ae43e2f301bf1c2e46906a487d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Jan 2012 07:09:39 +0800
Tag:    v2.1.5

Merge branch 'MDL-30033_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit e06a172b7057a41d1eb52b9a2d7a66987b5a4131
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Jan 2012 07:06:55 +0800
Tag:    v2.1.5

Merge branch 'MDL-31065_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 63f1c0d53173ac45c3b130e4fd1e4ac5633f085c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 23 Jan 2012 08:04:34 +0800
Tag:    v2.1.5

Merge branch 'w04_MDL-31181_m21_fitlertestcfg' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 6f892151beafdcd96dafbfe671f846b0d55cd048
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 23 Jan 2012 07:56:42 +0800
Tag:    v2.1.5

Merge branch 'MDL-31058_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 158c275618c509e51eff6d4bb189b0c58ac7841e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 23 Jan 2012 07:28:40 +0800
Tag:    v2.1.5

Merge branch 'w04_MDL-31185_m21_postscfg' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit b5ebcf648b98f943c40542ec135ce9679e221d86
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 19 Jan 2012 20:29:09 +0800
Tag:    v2.1.5

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 58bdb2e6da788071e6e85747215fcd6a0fb02a4f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 Jan 2012 19:37:44 +0800
Tag:    v2.1.5

Merge branch 'w03_MDL-31213_m21_attributesmess' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 35dc672ead1efe41197d44aae85f96147833087f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 Jan 2012 09:02:21 +0800
Tag:    v2.1.5

Merge branch 'MDL-31080_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 6acec6c45733df5268ef6224e14e61f9c07aa66e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 Jan 2012 08:32:35 +0800
Tag:    v2.1.5

Merge branch 'w03_MDL-31171_m21_blogattachment' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 44335d9ea993d3b1d2eef3eefb79067bcb13a427
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 16 Jan 2012 09:07:22 +0800
Tag:    v2.1.5

Merge branch 'w03_MDL-31165_m21_innodbconv' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit bbf3aaf0c1181ab347c52aa3034d938e121d1bc3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 12 Jan 2012 18:26:57 +0800
Tag:    v2.1.5

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit a33fc27467361fe11e86ad6c8ef9b31b54206c8d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 11 Jan 2012 06:35:26 +0800
Tag:    v2.1.5

Merge branch 'MDL-31101_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 9334f3d084a31e27a0a8072a6efd325b15aabe50
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 09 Jan 2012 09:14:45 +0800
Tag:    v2.1.5

Merge branch 'MDL-30031-21' of git://github.com/bostelm/moodle into MOODLE_21_STABLE

commit 86e84df668880975fcca872b2f8e3a23941b6ada
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 09 Jan 2012 07:33:47 +0800
Tag:    v2.1.5

Merge branch 'MDL-30966-print-object_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit 78fcd06775d95bcc9a8cd9113e3bea08ca941b82
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 05 Jan 2012 19:50:39 +0800
Tag:    v2.1.4

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 0890c256ee135d4a019b1e521cccdeaa4bb1867e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Jan 2012 09:14:53 +0800
Tag:    v2.1.4

Merge branch 'MDL-30879-m21' of git://github.com/sammarshallou/moodle into MOODLE_21_STABLE

commit f1ec3e694c254b3bfbd3bdb6fed726bd61231e37
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 23 Dec 2011 09:53:23 +0800
Tag:    v2.1.4

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 7f50276ea01c03150a5b3a858358063399b81687
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 21 Dec 2011 06:34:23 +0800
Tag:    v2.1.4

Merge branch 'MDL-30170-mnet-undelete_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit df752e6a1d6bb2568cd20de2148f2cc9fcf9af74
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 21 Dec 2011 02:50:03 +0800
Tag:    v2.1.4

Merge branch 'MDL-30603_m21' of https://github.com/nebgor/moodle into MOODLE_21_STABLE

commit 65cb4fe5484258cad15664a7a9b3539228835f0a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 21 Dec 2011 01:56:24 +0800
Tag:    v2.1.4

Merge branch 'MDL-29048-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit 107ebdb86d1fc710e79bcdf4e64b5e6ee5406578
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 20 Dec 2011 10:13:11 +0800
Tag:    v2.1.4

Merge branch 'wip-mdl-29067-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit 0a6d17e288d5c0b729c677f7585df95ce373890f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 20 Dec 2011 09:22:20 +0800
Tag:    v2.1.4

Merge branch 'MDL-30739_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit bf5bb85d421dcc74fbb931f6823cfbb7ed4bff8c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 20 Dec 2011 09:01:49 +0800
Tag:    v2.1.4

Merge branch 'MDL-30738_21_STABLE' of git://github.com/kiklop74/moodle into MOODLE_21_STABLE

commit 6e1f50f2c84db94a6e63d4807ea9ef3fefa2f665
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 20 Dec 2011 07:05:36 +0800
Tag:    v2.1.4

Merge branch 'MDL-30741_m21' of git://github.com/jfilip/moodle into MOODLE_21_STABLE

commit 12a1176976bab005ea3c89d78c5c17dff0aac489
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 19 Dec 2011 09:58:44 +0800
Tag:    v2.1.4

Merge branch 'wip-MDL-30791-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE

commit c4190e3140c5917cbc6001eea4ed3038ae6556ee
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 15 Dec 2011 05:45:32 +0800
Tag:    v2.1.4

Merge branch 'MDL-30592_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 222b780775fd99dce637ae73e0691d05696697e0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 14 Dec 2011 10:16:48 +0800
Tag:    v2.1.4

Merge branch 'wip-MDL-27767-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE

commit 5e48a7c5efb1ec9f5109d7506cc951477122c80b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 09 Dec 2011 23:09:39 +0800
Tag:    v2.1.4

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 55dae3ac866e08577ed28f8efa7dfbe59ed53fed
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 09 Dec 2011 06:37:37 +0800
Tag:    v2.1.4

Merge branch 'MDL-29579_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 938965931d8f99b3ba5faadde32dc9149bd53deb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 09 Dec 2011 02:23:35 +0800
Tag:    v2.1.4

Merge branch 'MDL-30658_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 5d497d7f4b6cb91c746f66b88e4b3d1e5d4d753f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 08 Dec 2011 08:37:20 +0800
Tag:    v2.1.4

Merge branch 'wip-MDL-30582-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE

commit 62bd66a5bc8fa4dbf11c0e4592a07cbda7ed0b94
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 08 Dec 2011 08:02:24 +0800
Tag:    v2.1.4

Merge branch 'MDL-26522_user_report_menu_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit c9bb3cd57586e366472b246f20549b839938805c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 08 Dec 2011 07:45:36 +0800
Tag:    v2.1.4

Merge branch 'MDL-27314_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 259739c8a37c1a5ffffef77e2580d85d7990083e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 08 Dec 2011 07:40:15 +0800
Tag:    v2.1.4

Merge branch 'wip-MDL-30222-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE

commit 824e110b8c427c4f5e9c4544535a22656500551b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 01 Dec 2011 19:04:21 +0800
Tag:    v2.1.4

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 5f7fc6ca311fa07a7b3c58322852d1abd850902b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 01 Dec 2011 17:45:16 +0800
Tag:    v2.1.4

Merge branch 'MDL-30544_disable_notifications_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit 360dd25e1eb429c026b3fee0a0be29e99c33c168
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 30 Nov 2011 02:47:57 +0800
Tag:    v2.1.4

Merge branch 'wip-mdl-30466-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit 6d959a5564ae0457b032708d9424327c6a9cc6f9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Nov 2011 10:18:13 +0800
Tag:    v2.1.4

Merge branch 'wip-MDL-30378-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE

commit 64f26a26732250d6d1322f36f8b34d0a7a2a8d88
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 28 Nov 2011 06:40:01 +0800
Tag:    v2.1.3

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 7d93ab41895dee0503ab459574d48d81a14c5727
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 28 Nov 2011 06:18:09 +0800
Tag:    v2.1.3

Merge branch 'dropbox-api-bump-for-21_STABLE' of git://git.luns.net.uk/moodle into MOODLE_21_STABLE

commit cc0988ad2bdbf12eb53d92e4815436ff3e585dce
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 25 Nov 2011 18:05:14 +0800
Tag:    v2.1.3

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 4b67fa946b870565821d0c874b4c127b6d2e53b8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 20:38:40 +0800
Tag:    v2.1.3

Merge branch 'wip-mdl-30394-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit 279fa1b994ac97f9e69e27a4b5552a8e9b49cf48
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 20:28:52 +0800
Tag:    v2.1.3

Merge branch 'wip-mdl-30375-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit 1f8ca423da1573dee05cb265aa81c77fd939b8e3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 19:06:14 +0800
Tag:    v2.1.3

Merge branch 'MDL-29095_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 9e2c51dbf2b38d8a6fc0d2ec16f8a17154e0d8b1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 18:48:13 +0800
Tag:    v2.1.3

Merge branch 'MDL-29060_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 8ed17824f6ad83c6fba54fea32ca8f9680a8dd1d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 18:38:09 +0800
Tag:    v2.1.3

Merge branch 'wip-mdl-28947-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit 5a66a2b9c575db2de53c3bb3da45a1c3e5526ef4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 10:07:25 +0800
Tag:    v2.1.3

Merge branch 'MDL-30042-MOODLE_21_STABLE-1' of git://git.luns.net.uk/moodle into MOODLE_21_STABLE

commit 4df0583e219a1605a1587aea349b461812aa38d7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 10:02:26 +0800
Tag:    v2.1.3

Merge branch 'MDL-27045_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 156ec7701e9858b624c17a113f95a82ea75a7c5b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 08:22:20 +0800
Tag:    v2.1.3

Merge branch 'm21_MDL-30223' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit 30a83348fe5510c4a4d4e10c556dbc26f0033a97
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 08:07:58 +0800
Tag:    v2.1.3

Merge branch 'MDL-30402-install-string_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit f249bab334a1dd9a0cbb30cc3bd49063f51071cb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Nov 2011 02:43:12 +0800
Tag:    v2.1.3

Merge branch 'mdl-23006-xmldb-missing-strings-m21' of git://github.com/sbourget/moodle into MOODLE_21_STABLE

commit b7341aa1360198756989e3167bf0983e7534cc62
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 18 Nov 2011 08:18:14 +0800
Tag:    v2.1.3

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 6c628d482ae56ce85827e8673f9a4f79cdae5a56
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 18 Nov 2011 03:16:13 +0800
Tag:    v2.1.3

Merge branch 'MDL-29350-MOODLE_21_STABLE-2' of git://git.luns.net.uk/moodle into MOODLE_21_STABLE

commit d3606a9a844b886072a37595ec333eb6825e7000
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Nov 2011 08:22:41 +0800
Tag:    v2.1.3

Merge branch 'MDL-29743_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 1e7732cec6654056a06764077d7ef4fa77326c27
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Nov 2011 07:45:28 +0800
Tag:    v2.1.3

Merge branch 'MDL-30069_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 372d9df6506e432f700d0a820d9e91ec7b505591
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Nov 2011 07:35:12 +0800
Tag:    v2.1.3

Merge branch 'MDL-30122_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 71a215991d29cb098352bb94dc0910ba3435ae9c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Nov 2011 07:31:24 +0800
Tag:    v2.1.3

Merge branch 'MDL-30167_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 830969cc63bbb5ae8073e8ecf4119f88fa379a1a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Nov 2011 07:11:02 +0800
Tag:    v2.1.3

Merge branch 'MDL-30186_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 96ec3502f0dfcbe1910f9c8e721bab2b086dfffc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Nov 2011 07:08:40 +0800
Tag:    v2.1.3

Merge branch 'MDL-30199_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 373c70e5d55c7482f4c27564993bc6d3f1a9186a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Nov 2011 07:02:16 +0800
Tag:    v2.1.3

Merge branch 'MDL-30209_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit edfcab2970b89ededdb2ee3247f20e9b01673df4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Nov 2011 06:59:45 +0800
Tag:    v2.1.3

Merge branch 'MDL-30300_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 88f8312aa086af846288a5856d7d53d2e1c5b0ba
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 15 Nov 2011 17:55:11 +0800
Tag:    v2.1.3

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit cd6ac6c8b8a5891deb53cfc1c861d057d0949019
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 Nov 2011 09:43:46 +0800
Tag:    v2.1.3

Merge branch 'MDL-29035-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit 3a2fc5926a0877e995f361f756d323f0de933d01
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 Nov 2011 09:34:16 +0800
Tag:    v2.1.3

Merge branch 'MDL-22351-M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit c35c8eb8e637cb048f7d12f98929312241c098a6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 Nov 2011 08:18:58 +0800
Tag:    v2.1.3

Merge branch 'mdl-29529-assignment-submission-sorting-m21-2' of git://github.com/sbourget/moodle into MOODLE_21_STABLE

commit 0242c9ba9e51d42741d818cc007c8ad41c43593b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 10 Nov 2011 08:54:34 +0800
Tag:    v2.1.3

Merge branch 'MDL-30045' of git://github.com/mouneyrac/moodle into MOODLE_21_STABLE

commit 8ec13b3312f922706951608ac3b52b4a9b9ece1e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 10 Nov 2011 08:33:47 +0800
Tag:    v2.1.3

Merge branch 'MDL-28426_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 147ec85e06c88864bd55bf80fa90e9df55953b50
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 10 Nov 2011 07:22:42 +0800
Tag:    v2.1.3

Merge branch 'MDL-30158-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit 4eeae5a67310c96149d7f6f79d04f4954aa4ee77
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Nov 2011 22:56:26 +0800
Tag:    v2.1.3

Merge branch 'MDL-27542b_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit fe23b6e72f65bc13e351539ce3a3fab08a148021
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Nov 2011 09:25:50 +0800
Tag:    v2.1.3

Merge branch 'm21_MDL-29159' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit b797666fe8471d8df8d5b633b1d9bf52c37b4035
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Nov 2011 07:43:50 +0800
Tag:    v2.1.3

Merge branch 'MDL-29803' of git://git.luns.net.uk/moodle into MOODLE_21_STABLE

commit d4a8a15d7fe660e7a0aec079cbd9cebd51f26242
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 03 Nov 2011 02:48:42 +0800
Tag:    v2.1.3

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 3d4bcfbddfe67e409733fe3047d3609a629a4b22
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Nov 2011 03:13:26 +0800
Tag:    v2.1.3

Merge branch 'MDL-29879_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit c3a648c34297e67c4ba2e60c28635678203f7736
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Nov 2011 02:54:53 +0800
Tag:    v2.1.3

Merge branch 'm21_MDL-29213' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit 7f5d1ef3c0712d850b94cfd8af271cadf7a8ef5c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 28 Oct 2011 00:49:09 +0800
Tag:    v2.1.3

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit fd26ea42183a554139ac6f3c580d153d6fe0ece1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Oct 2011 23:44:10 +0800
Tag:    v2.1.3

Merge branch 'MDL-29815_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 9ee2ba4676b605e35e13b5dd506c2e77fe74b83b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Oct 2011 07:54:10 +0800
Tag:    v2.1.3

Merge branch 'MDL-29339_b_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 9aa5b604ecd31147d9e47a4f617004768066eb82
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Oct 2011 05:14:49 +0800
Tag:    v2.1.3

Merge branch 'w42_MDL-29867_m21_author' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 26c8e82338722f1a4f67f5acb607fc519629bb7c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 20 Oct 2011 00:41:34 +0800
Tag:    v2.1.3

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 0e6186fb45b5df7b9685ea898a3dea6c73d731c3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Oct 2011 17:00:35 +0800
Tag:    v2.1.3

Merge branch 'wip-MDL-29496-stable21' of git://github.com/phalacee/moodle into MOODLE_21_STABLE

commit 7edd6c250ddd79ed05da00a5f6fa072c9e729e9f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 17 Oct 2011 22:24:10 +0800
Tag:    v2.1.3

Merge branch 'w41_MDL-28454_m21_yuibackport' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 171bbdad02c0d5c6e0db2d106a628146b4c078f5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 17 Oct 2011 03:32:05 +0800
Tag:    v2.1.3

Merge branch 'MDL-28219d-21' of git://github.com/bostelm/moodle into MOODLE_21_STABLE

commit c2dc95003e5e98cb9e3dedfb0dba4d5c9d0680f9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 17 Oct 2011 00:50:04 +0800
Tag:    v2.1.3

Merge branch 'MDL-29191' of git://github.com/hit-moodle/moodle into MOODLE_21_STABLE

commit 52bc12cedcbf1ee87b372dd4f402cea4c80d8766
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sun, 16 Oct 2011 23:37:41 +0800
Tag:    v2.1.3

Merge branch 'MDL-28483-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit c4101db0169ad51cc8cb55bcabaa37a5f10e88db
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 07 Oct 2011 06:05:07 +0800
Tag:    v2.1.2

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit f1ae261bc98fcf084819b498f6c6c3d5822ee029
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Oct 2011 07:14:47 +0800
Tag:    v2.1.2

Merge branch 'MDL-28469_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 19fcc09ac7a57f7c3c25e5f607e672439a47bef4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Oct 2011 07:10:24 +0800
Tag:    v2.1.2

Merge branch 'wip-MDL-25697-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE

commit 19c8fd9e8b80a3fbcc1fc0eeeff526226f92082f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Oct 2011 05:40:23 +0800
Tag:    v2.1.2

Merge branch 'MDL-29644_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 807f806ed736e0f98b5a4db62264dc5e4f727413
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Oct 2011 18:46:24 +0800
Tag:    v2.1.2

Merge branch 'MDL-27857-assignment-portfolio_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit 85dd2a674ac0b18b05a6c0930a5fbf21c1d5fa9a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Oct 2011 18:37:45 +0800
Tag:    v2.1.2

Merge branch 'MDL-29548_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit fdca6e83218762456c2b085c34231d0bd3052c83
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Oct 2011 18:12:33 +0800
Tag:    v2.1.2

Merge branch 'MDL-19575-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit c3a4009a56e7196151c26144ba8942a7a010f60b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Oct 2011 07:11:48 +0800
Tag:    v2.1.2

Merge branch 'MDL-29511_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit f0837f65d868a3d1cf70fa88750dbf0c6c8ada78
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Oct 2011 04:55:56 +0800
Tag:    v2.1.2

Merge branch 'MDL-29216_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit a70eda6cc8719d3da4a9dd7bec5892f420d716e8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Oct 2011 04:50:30 +0800
Tag:    v2.1.2

Merge branch 'MDL-29341_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit c5c9be022d78820b3e9fce2675cd7f61d1dafb65
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Oct 2011 03:42:55 +0800
Tag:    v2.1.2

Merge branch 'MDL-29570_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit f7bb84df23aa8253d77a213cc2479349f92673e6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 28 Sep 2011 17:04:28 +0800
Tag:    v2.1.2

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 2b4dcfdcbd97cfb4f46a6bb4886addc45d08b2ac
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 27 Sep 2011 06:54:49 +0800
Tag:    v2.1.2

Merge branch 'MDL-28686-21' of git://github.com/bostelm/moodle into MOODLE_21_STABLE

commit 3dba01a40fbb33c9c0c824dfe0cbc984d70eda27
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 27 Sep 2011 05:57:30 +0800
Tag:    v2.1.2

Merge branch 'w38_MDL-29535_m21_filters' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit dc110687c8b8cae9aaa85d25ffca0f23cec23247
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 27 Sep 2011 04:42:09 +0800
Tag:    v2.1.2

Merge branch 'MDL-29462_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 0518140c31294913ebfdafa73eef2966dfcbf13e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 27 Sep 2011 04:28:47 +0800
Tag:    v2.1.2

Merge branch 'MDL-28202_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 4d7a9cd8f59e2da6f270110e47db46422d2c3885
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 27 Sep 2011 04:01:35 +0800
Tag:    v2.1.2

Merge branch 'MDL-29427_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit ba1afa0d9561c55807451c7052fbb1b0402da89e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 27 Sep 2011 03:44:49 +0800
Tag:    v2.1.2

Merge branch 'MDL-29528_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 06a22aecb70749ac1ef160e749688f5016abc618
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 21 Sep 2011 23:04:43 +0800
Tag:    v2.1.2

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit e63827ad98fc6743cd4ead36f2f0c4182835cfab
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 21 Sep 2011 06:11:14 +0800
Tag:    v2.1.2

Merge branch 'MDL-26567_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 7f0d91d5465851802d446af0cf1c0b0e0aae91c7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 20 Sep 2011 15:51:18 +0800
Tag:    v2.1.2

Merge branch 'wip-mdl-29079-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit 0ff54e134f103e0e91ffb6e4fbaad5990c578cef
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 20 Sep 2011 06:17:42 +0800
Tag:    v2.1.2

Merge branch 'wip-mdl-29079-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit 5af8bbf85437bbfc2c06728ee90de09f8d2eb5b7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 20 Sep 2011 06:04:17 +0800
Tag:    v2.1.2

Merge branch 'MDL-28679_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 75ebacb1ec86d8f64ac7c1432fe528c69b11b583
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 20 Sep 2011 05:37:49 +0800
Tag:    v2.1.2

Merge branch 'MDL-29126_export_separator_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit 929c1e4a8b73a33ef57b92f85021d1b0842f7875
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 16 Sep 2011 07:34:34 +0800
Tag:    v2.1.2

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 0780ba7ca78e9b67c5949cd647c2fc12ac48464c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 07 Sep 2011 23:49:21 +0800
Tag:    v2.1.2

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 06b66d530bb1bf31bdcfaea4d631070d0a12e282
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 06 Sep 2011 19:56:08 +0800
Tag:    v2.1.2

Merge branch 'wip-MDL-28043-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE

commit 57d30b527646ca6e3b4a5cda408dcf786fb921ab
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 06 Sep 2011 07:59:49 +0800
Tag:    v2.1.2

Merge branch 'wip-mdl-28987-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit 593b4518ada3e8dbfaad0c5cf88c018f6b7509ba
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 06 Sep 2011 07:27:51 +0800
Tag:    v2.1.2

Merge branch 'wip-mdl-23520-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit abaff947c609ece5e9e1be6a85a87cab7def5959
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 06 Sep 2011 06:38:38 +0800
Tag:    v2.1.2

Merge branch 'wip-MDL-29006-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE

commit ae115cf22959cc27802b0a9a9d3b8736a8825417
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 06 Sep 2011 03:52:08 +0800
Tag:    v2.1.2

Merge branch 'w35_MDL-29145_m21_imscpregression' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 3853dc585c52e09b152ba4c7a70d8ced1fc914e2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 31 Aug 2011 07:29:39 +0800
Tag:    v2.1.2

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 9c89f307f874e57f23e51a653475a67376c4c024
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2011 19:01:57 +0800
Tag:    v2.1.2

Merge branch 'MDL-29141_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 4524a47a0af47c5764e5e7ab0c8f853582b97dc1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2011 16:30:59 +0800
Tag:    v2.1.2

Merge branch 'wip-MDL-24202-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE

commit 5a8f177c730bff3c2fe570151ab065a3810c9489
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2011 09:26:41 +0800
Tag:    v2.1.2

Merge branch 'MDL-28943_manage_message_name_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit fa3dff131824303cfa2efbaf083117ad3373a5ef
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2011 09:23:28 +0800
Tag:    v2.1.2

Merge branch 'MDL-26302_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 6e582f163257a1c3fcb619fb46a272a76d392f7d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2011 08:52:55 +0800
Tag:    v2.1.2

Merge branch 'MDL-29064_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 3bdb9bfd54a7ed9889ece3eb72ba344e11bd9e5c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2011 08:41:27 +0800
Tag:    v2.1.2

Merge branch 'MOODLE_21_STABLE' of git.moodle.org:/git/integration into MOODLE_21_STABLE

commit 1dd41f0eb140fcefaf5cf55b111035089ed1f8e7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2011 08:40:08 +0800
Tag:    v2.1.2

Merge branch 'MDL-29062_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 4984e712e6904b515f330c198faa617aaf274324
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2011 08:02:55 +0800
Tag:    v2.1.2

Merge branch 'MDL-29111_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 119b8951332bc0d21821583e3a53edba8431a856
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2011 07:33:03 +0800
Tag:    v2.1.2

Merge branch 'wip_MDL-16168_2.1_CAS_crash_if_no_LDAP' of https://github.com/iarenaza/moodle into MOODLE_21_STABLE

commit 04dc7f877ba3ac045a3466721c85d0eef9990132
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2011 07:22:42 +0800
Tag:    v2.1.2

Merge branch 'MDL-25872-21' of git://github.com/bostelm/moodle into MOODLE_21_STABLE

commit 200cb06bfc688364aaa1f3b5a9471bb8d481ba76
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 26 Aug 2011 20:56:52 +0800
Tag:    v2.1.2

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit ee4dee99e8998fdf9037d6bc28f05f7909321c1a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 25 Aug 2011 16:46:11 +0800
Tag:    v2.1.2

Merge branch 'MDL-27823_bulk_messaging_2_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit efc2de0e97ed1384af628de2ad91f5545adcbac1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 25 Aug 2011 07:15:49 +0800
Tag:    v2.1.2

Merge branch 'MDL-28650-MOODLE-21-STABLE' of https://github.com/mouneyrac/moodle into MOODLE_21_STABLE

commit ddec658859c27366dbf2f64f226aeb5484c0b463
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 23:12:18 +0800
Tag:    v2.1.2

Merge branch 'MDL-28684_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 7faa5b4e9cdb07f1a5aa71009cca52145dbdd5b5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 18:57:51 +0800
Tag:    v2.1.2

Merge branch 'MDL-28976_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit adc0d74ac9ef65ed9fa42ec2115de1dce4aaba3a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 09:51:51 +0800
Tag:    v2.1.2

Merge branch 'w33_MDL-29022_m21_idnumber' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit b61fd419e855940259e50cfd0c9f93b825a098e0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 07:56:06 +0800
Tag:    v2.1.2

Merge branch 'MDL-28979_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 7a4a1f14ca2e772e5d24c20c422d19cd9ec314fa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 07:45:23 +0800
Tag:    v2.1.2

Merge branch 'MDL-28975_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 4ffedd8b0eb86c2ac2bfd3cf577db81b29e36900
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 05:32:36 +0800
Tag:    v2.1.2

Merge branch 'w33_MDL-28708_m21_f304' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 71cf843ad2b8d172ea3488884bafc3bab7142574
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 05:23:15 +0800
Tag:    v2.1.2

Merge branch 'w33_MDL-28709_m21_h304' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit fd7bdf278c71e921e73f832f2e8add40d299c95b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 05:13:28 +0800
Tag:    v2.1.2

Merge branch 'w33_MDL-29011_m21_nomanualenrol' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 251037cefdf4d6297bd826e357baec94a1c9013e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 04:53:11 +0800
Tag:    v2.1.2

Merge branch 'MDL-28684b-21' of git://github.com/bostelm/moodle into MOODLE_21_STABLE

commit 3d95259d7e403681cc7f4e408f05f15e7c24a83c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 04:48:06 +0800
Tag:    v2.1.2

Merge branch 'MDL-28444-21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit f403941133f54ab9b1d2e6c2bb24581d56832611
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 00:43:21 +0800
Tag:    v2.1.2

Merge branch 'm21_MDL-28962' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit a1eeb0185a4713e2f7d26d1d7e3a67c9faf4c414
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 00:01:16 +0800
Tag:    v2.1.2

Merge branch 'MDL-28957_21' of git://github.com/colchambers/moodle into MOODLE_21_STABLE

commit dc70aa7378f298d24092de34cecd3872dd1ebe0d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Aug 2011 23:31:12 +0800
Tag:    v2.1.2

Merge branch 'MDL-28397-21' of https://github.com/totara/moodle into MOODLE_21_STABLE

commit 72bd83e0f1641f698738f9995100376697c2f1d8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Aug 2011 17:03:42 +0800
Tag:    v2.1.2

Merge branch 'w33_MDL-28381_m21_cliphpver' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 1b69c111cc9b0fd5c42c88b2c169500e5bc6206b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Aug 2011 16:42:52 +0800
Tag:    v2.1.2

Merge branch 'MDL-28996_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit d94b4b327dc7b30b2363a3c8d16d5c5b54edeea5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Aug 2011 08:49:59 +0800
Tag:    v2.1.2

Merge branch 'm21_MDL-28999' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit 5cfb11947529e4ae88cc3fd1cce083c5a9165cf0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Aug 2011 08:37:01 +0800
Tag:    v2.1.2

Merge branch 'MDL-28990-MOODLE_21_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_21_STABLE

commit 092c6089c975fa83c2b708e924c8539df83c9c4e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Aug 2011 08:05:08 +0800
Tag:    v2.1.2

Merge branch 'w33_MDL-29031_m21_oldblock' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 8fb354212665eaf1e25370f79587ff97e2c15742
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Aug 2011 07:42:25 +0800
Tag:    v2.1.2

Merge branch 'MDL-28226_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit b1ea3fb2c6c9c172564b39cc6c6c3aae17ccd173
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Aug 2011 07:20:24 +0800
Tag:    v2.1.2

Merge branch 'w33_MDL-28936_m21_msgstrlen' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 94aa0fbe8c0505d8d8f99b8a39b73b4ef5c70701
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Aug 2011 07:17:17 +0800
Tag:    v2.1.2

Merge branch 'MDL-28241_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit cd91adc715a5db7a7236e1a443b0ef05b60dc0c6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 18 Aug 2011 08:38:43 +0800
Tag:    v2.1.2

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit ad307c71212aeee864cfa33bc95bef7f07abd3c0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 21:40:00 +0800
Tag:    v2.1.2

Merge branch 'MDL-28349_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 74475bd5d52e55c27c99f92662eb27e15bda4ad8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 08:59:38 +0800
Tag:    v2.1.2

Merge branch 'wip-mdl-27219-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit c30dadce6f8c5c31a72883f521b3c3ea1fa2c550
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 08:51:57 +0800
Tag:    v2.1.2

Merge branch 'MDL-28737_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 4239318be97c9808b208a6661601d4e27c4be155
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 07:29:20 +0800
Tag:    v2.1.2

Merge branch 'MDL-21934_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 33868528bba921bb723e1a72c1ea8b4882ee3396
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 07:02:21 +0800
Tag:    v2.1.2

Merge branch 'MDL-27752_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit e3af6a00ba430419e4299e9ff564cfc56245b8b3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 06:45:25 +0800
Tag:    v2.1.2

Merge branch 'MDL-28643-m21' of git://github.com/sammarshallou/moodle into MOODLE_21_STABLE

commit 95caac3cc809a46b113a8f1f283c85d87db1c459
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 06:33:07 +0800
Tag:    v2.1.2

Merge branch 'm21_MDL-28649' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit c89c3907593491127befce094f23dd9c109f17c2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 06:29:23 +0800
Tag:    v2.1.2

Merge branch 'MDL-28652_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 25bde46869f68bf9204c154ff439cadd03bda97c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 06:25:46 +0800
Tag:    v2.1.2

Merge branch 'MDL-28653_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 88b340161b071588f4fad4da8e32f9f7fa3c908b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 06:07:44 +0800
Tag:    v2.1.2

Merge branch 'MDL-28655-21' of git://github.com/bostelm/moodle into MOODLE_21_STABLE

commit 5b18861bf01c6a836765b686169e807f92921927
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 05:44:12 +0800
Tag:    v2.1.2

Merge branch 'm21_MDL-28721' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit 84e093e14318fc855a6cdadbbd76d9743001fef4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 19:11:16 +0800
Tag:    v2.1.2

Merge branch 'wip-MDL-26754-MOODLE_21_STABLE' of github.com:marinaglancy/moodle into MOODLE_21_STABLE

commit 02b36f79d2e6a4123baaaec9a08379000200cfd5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 19:03:59 +0800
Tag:    v2.1.2

Merge branch 'MDL-28365_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit a6f18c98f43b6fc6b8b7c4e96af41cb4a626e1b8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 17:51:53 +0800
Tag:    v2.1.2

Merge branch 'MDL-23872_m21' of git://github.com/nebgor/moodle into MOODLE_21_STABLE

commit 28f9b39287874b53da360d350d2a2145e3610c7b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 09:06:07 +0800
Tag:    v2.1.2

Merge branch 'MDL-28931_m21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit e42213ab7204a1ace6df39ec9c1b480914d91fc7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 08:14:49 +0800
Tag:    v2.1.2

Merge branch 'wip-mdl-27728-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit 68d998c6cf329fc8e1fc3b7a1c4e2db250519abf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 08:07:37 +0800
Tag:    v2.1.2

Merge branch 'MDL-27030_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 0031600453c0e8373a1b62f9e18d86dd1206c854
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 08:00:36 +0800
Tag:    v2.1.2

Merge branch 'wip-mdl-27896-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit 3bcd0781f1fbd4698cead19bc887a08d1553527c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 06:39:18 +0800
Tag:    v2.1.2

Merge branch 'm21_MDL-25757' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit a4f85cc57968f8ab4d83d5b07b1a571243e22977
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 02:02:33 +0800
Tag:    v2.1.2

Merge branch 'm21_MDL-28603' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit 2ce0d4069402e9d2977a516267809094e5244cd0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 01:34:59 +0800
Tag:    v2.1.2

Merge branch 'MDL-28939_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit d0aeb0abfa79cd6a5c9498471d45864933dc6a82
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 12 Aug 2011 06:13:16 +0800
Tag:    v2.1.2

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 7637e2e5e427da207e85ed886f11b401feaf83f5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Aug 2011 05:04:13 +0800
Tag:    v2.1.2

Merge branch 'MDL-27491-m21' of git://github.com/sammarshallou/moodle into MOODLE_21_STABLE

commit d980c1d746ac758eece3b41a1080de12fd5fc694
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Aug 2011 04:58:04 +0800
Tag:    v2.1.2

Merge branch 'm21_MDL-28295' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit 92714145227eeac50e0b3c95f5d67e169ea8dec1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Aug 2011 09:06:52 +0800
Tag:    v2.1.2

Merge branch 'MDL-27631_21' of git://github.com/mkassaei/moodle into MOODLE_21_STABLE

commit 6c506c9a077dcef96b91a95e499bd43443a5b810
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Aug 2011 08:49:03 +0800
Tag:    v2.1.2

Merge branch 'MDL-27550-workshop-feedback_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit a28b6620d6c120ad73e6585114bba4c847a0321c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Aug 2011 08:37:07 +0800
Tag:    v2.1.2

Merge branch 'w31_MDL-27597_m21_catlike' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit d04b3d580e8cd1ff63a0b5f022077db3f5063fd5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Aug 2011 07:11:51 +0800
Tag:    v2.1.2

Merge branch 'wip-MDL-28407-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE

commit 0f61d7f97c6236ae396ab0238b33e6ba82af5f5f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Aug 2011 01:33:09 +0800
Tag:    v2.1.2

Merge branch 'w31_MDL-28533_m21_columnperf' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit fd6a17ecfb0552a4b6c7b17bb035d231035e5886
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Aug 2011 16:15:48 +0800
Tag:    v2.1.2

Merge branch 'MDL-28565_m21' of git://github.com/nebgor/moodle into MOODLE_21_STABLE

commit 6b4422a086a0df52e746f6cfd412bfc0db22c99d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Aug 2011 15:42:59 +0800
Tag:    v2.1.2

Merge branch 'MDL-28604_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit fe97a3dc7acb328d0dc7cafa62b39159b966117a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Jul 2011 01:05:04 +0800
Tag:    v2.1.1

Merge branch 'MDL-28221-resource-conversion_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit 6f09ed8643704189e670e6ee29a087971b2d4da8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jul 2011 22:30:33 +0800
Tag:    v2.1.1

Merge branch 'm21_MDL-28017' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit 1187c38d6d5b24aba8defd83b2d677bc10e91164
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jul 2011 01:48:10 +0800
Tag:    v2.1.1

Merge branch 'm21_MDL-26942' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit a19c77bd242b722b679814252bb620baca2597a4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jul 2011 01:43:53 +0800
Tag:    v2.1.1

Merge branch 'MDL-27755_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit b8cde34b06fae7702b3929c58153965dfd2cac19
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jul 2011 01:36:01 +0800
Tag:    v2.1.1

Merge branch 'MDL-27741_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit 24813d35f76506c107a90fa97f351e88c12cc127
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 08 Jul 2011 07:18:44 +0800
Tag:    v2.1.1

Merge branch 'MDL-28015-workshop-sql_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit 8437ce030de94ae3cb820c7b63e68948aa183aae
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 08 Jul 2011 06:58:08 +0800
Tag:    v2.1.1

Merge branch 'MDL-28168-custommenu_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit 14cf05a2cf06986d9c70edaf61f9a802aa5555b1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Jul 2011 09:01:30 +0800
Tag:    v2.1.1

Merge branch 'm21_MDL-28110' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit e986a24a9d90a5ef7f63c0ac4c5a6952fa25c9a7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Jul 2011 08:22:22 +0800
Tag:    v2.1.1

Merge branch 'MDL-27989_MOODLE_21_STABLE' of git://github.com/kordan/moodle into MOODLE_21_STABLE

commit d396a03bacfbee8be092b03e9e5dcafcf0c72f59
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Jul 2011 23:59:57 +0800
Tag:    v2.1.1

Merge branch 'MDL-28185_m21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit c5b0344b6226c977623684a02a3c1cae57f03ede
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 02 Jul 2011 04:33:04 +0800
Tag:    v2.1.0

Merge branch 'MDL-28152-course-grade-category' of git://github.com/mudrd8mz/moodle

commit 0e2901443c29ee28577afe5880aab31be402b58b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 02 Jul 2011 04:17:16 +0800
Tag:    v2.1.0

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

commit ec48e283b04a0e12921c7298834759a68ecc7b17
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 01 Jul 2011 22:13:51 +0800
Tag:    v2.1.0

Merge branch 'MDL-27960' of git://github.com/nebgor/moodle

commit 264d81eee38089052695c5f3f11a7d09ccc33002
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 01 Jul 2011 19:43:05 +0800
Tag:    v2.1.0

Merge branch 's11_MDL-27976_undefined_variable_master' of github.com:dongsheng/moodle

commit 67fcc9989a38505d3ffad4bde8d37855c3c42f48
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 01 Jul 2011 17:51:26 +0800
Tag:    v2.1.0

Merge branch 'MDL-27829_block_pagetype_master' of git://github.com/andyjdavis/moodle

commit 3bd43d3d5c9b6f20dee8ac381954db33692776c7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 01 Jul 2011 17:05:17 +0800
Tag:    v2.1.0

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

commit 49752ecb59593b71c76fead328e756154b8db89c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 01 Jul 2011 16:40:15 +0800
Tag:    v2.1.0

Merge branch 'MDL-28022-glossary-export' of git://github.com/mudrd8mz/moodle

commit a80d6ab536ec13ee63aaa50e29283048deeeab91
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 01 Jul 2011 07:49:59 +0800
Tag:    v2.1.0

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

commit 70debd739141cb383c663d8013ebe591e5b2d750
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 01 Jul 2011 07:41:38 +0800
Tag:    v2.1.0

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

commit 4411596c276fd869526d650fd2008ed3100b26d4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 01 Jul 2011 07:37:43 +0800
Tag:    v2.1.0

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

commit d72129829f282682ee303261590aa0c733b725fb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 01 Jul 2011 07:10:06 +0800
Tag:    v2.1.0

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

commit f9d2eb4f20a1349b645647965522057f5f4366cc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 01 Jul 2011 06:54:35 +0800
Tag:    v2.1.0

Merge branch 'MDL-28099_wip' of git://github.com/jamiepratt/moodle

commit 7ace3a21996122d90653b08e08ddfbbc0631ca69
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 01 Jul 2011 06:09:50 +0800
Tag:    v2.1.0

Merge branch 'MDL-28006-convert-gradebook' of git://github.com/mudrd8mz/moodle

commit b1273d09dd753290b173649455124d1849de6db1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 01 Jul 2011 05:56:53 +0800
Tag:    v2.1.0

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

commit 0bd8f4c6653eb036f5b22389fc7eabd23d62d2c7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 23:09:42 +0800
Tag:    v2.1.0

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

commit 91dc377b74618b6a24eec32cad8509daf615587f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 22:39:45 +0800
Tag:    v2.1.0

Merge branch 'MDL-27829_block_pagetype_master' of git://github.com/andyjdavis/moodle

commit db0fe3b295b81bea33889efc511ca5678dd234f2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 22:22:20 +0800
Tag:    v2.1.0

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

commit 4ea6ce7e39fcfa0d87ea98c6e14bc5f5c59c1a55
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 07:59:49 +0800
Tag:    v2.1.0

Merge branch 'MDL-28044' of git://github.com/nebgor/moodle

commit 9829fa826124abdfc92013c5b81e486555b9e609
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 07:54:19 +0800
Tag:    v2.1.0

Merge branch 'MDL-15587-head' of git://github.com/grabs/moodle

commit 06a7f952cb83f945a7630a9de96fa70695efc68d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 07:16:57 +0800
Tag:    v2.1.0

Merge branch 'MDL-19864_database_excel_export' of git://github.com/andyjdavis/moodle

commit 0bde123fa80b8f296c95602d4349a9d063025c37
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 07:13:34 +0800
Tag:    v2.1.0

Merge branch 'wip-MDL-27431-master' of git://github.com/Beedell/moodle

commit ca2b89d5dfb7e62fb7be797ac7bde2d794fdf752
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 07:10:51 +0800
Tag:    v2.1.0

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

commit a092e9bc42f65a63a5873029577dda006b2db0af
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 06:55:20 +0800
Tag:    v2.1.0

Merge branch 'wip-MDL-25249-master-r1' of git://github.com/samhemelryk/moodle

commit 586fecb80bda0e3d9a6fcbf691f85b0ebe65d6dd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 06:20:43 +0800
Tag:    v2.1.0

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

commit 497ad94adbdaca0279391515940463b8e39e8897
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 06:02:51 +0800
Tag:    v2.1.0

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

commit f684dce0139afcc553257b5958ada15acbace14d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 06:00:12 +0800
Tag:    v2.1.0

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

commit 88933f08cbe66358f0b3bf3f481481ca586bb1f7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 05:51:33 +0800
Tag:    v2.1.0

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

commit 0f744d2ca402c0dde69d60053475ee1745a343d2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 05:33:01 +0800
Tag:    v2.1.0

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

commit be13d37a0299433e91bee2dda1fca04a57ba3866
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 05:09:13 +0800
Tag:    v2.1.0

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

commit f4eeee5bd59b0695502cc840f8befe615c2ccaec
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 03:00:06 +0800
Tag:    v2.1.0

Merge branch 'pagelib_single' of git://github.com/marxjohnson/moodle

commit 76feb947b68edfc2fcc675d88508f4831c017b8d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 02:58:27 +0800
Tag:    v2.1.0

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

commit f0548d18bf213aad5a0126dbadf06dda9778de44
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 02:47:16 +0800
Tag:    v2.1.0

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

commit fae9cd077c754f33d8eca20b92bbc8792282b8d1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 02:44:49 +0800
Tag:    v2.1.0

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

commit 282a0a713e504b6dcdd2781718e32c3a8a0c2b2f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 02:11:17 +0800
Tag:    v2.1.0

Merge branch 'MDL-28087_friendly_jabber' of git://github.com/andyjdavis/moodle

commit 1333c05ebe02924fe5e34a9faa4291c37f3a5038
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 02:00:49 +0800
Tag:    v2.1.0

Merge branch 's11_MDL-27936_send_message_master' of github.com:dongsheng/moodle

commit 3a4c390c53ac9b68710398c8bbf1c22b4b3b33fb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 01:50:39 +0800
Tag:    v2.1.0

Merge branch 's11_MDL-27976_get_users_by_courseid_master' of github.com:dongsheng/moodle

commit 9cdff2b2a5d555e8084cdbb3b55196d36aacfc72
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 00:12:18 +0800
Tag:    v2.1.0

Merge branch 'wip-MDL-27988-master' of git://github.com/samhemelryk/moodle

commit ae5b0cde4d3762f8ff677bdef96f14e110482f3a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Jun 2011 21:42:26 +0800
Tag:    v2.1.0

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

commit 0822174adc09f4c0ba83e8b0160cf92e65e761be
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Jun 2011 21:29:14 +0800
Tag:    v2.1.0

Merge branch 'MDL-27812_front_page_blocks' of git://github.com/andyjdavis/moodle

commit b28c4c22f3111dad9fc188a65daaa0b5ebb4f70e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Jun 2011 21:07:07 +0800
Tag:    v2.1.0

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

commit c5401e743d6a584f84307efab002073baef00e3b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Jun 2011 21:01:50 +0800
Tag:    v2.1.0

Merge branch 'MDL-28072_coursereport_undefined_function' of git://github.com/andyjdavis/moodle

commit cddb4287221cda3213bd692a5dd9116778be7da9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Jun 2011 04:14:54 +0800
Tag:    v2.1.0

Merge branch 'MDL-27990_assignment_notifications' of git://github.com/andyjdavis/moodle

commit 34ff02bff07722539f3e305cad15a848300a8e11
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Jun 2011 23:31:42 +0800
Tag:    v2.1.0

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit 32038aaccc3ee839f9f9416bd2931922d0ddf94a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Jun 2011 23:12:40 +0800
Tag:    v2.1.0

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

commit 3bdc10150c8c3a959970b7d9489afea44432edd9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Jun 2011 21:56:03 +0800
Tag:    v2.1.0

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

commit 8e0733f4d81b705d23f66514ae14a658fa616191
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Jun 2011 20:06:13 +0800
Tag:    v2.1.0

Merge branch 'unsigned_fixes' of git://github.com/stronk7/moodle

commit f83776f2ec4541fa6e132d63a24e45675e06a291
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Jun 2011 16:11:02 +0800
Tag:    v2.1.0

Merge branch 'wip-MDL-27809-master-r7' of git://github.com/samhemelryk/moodle

commit a8e6c39e9f01e6a338894025af4bd49c069819fc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Jun 2011 07:44:40 +0800
Tag:    v2.1.0

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

commit 2e27e2d64a8ba9f1738f85a449eb0a912be6452f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 24 Jun 2011 06:31:53 +0800
Tag:    v2.1.0

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

commit 89ad7c078ed5b7e3022c144df43678281ec02e02
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 24 Jun 2011 06:21:58 +0800
Tag:    v2.1.0

Merge branch 'MDL-27827_head' of git://github.com/grabs/moodle

commit 4965f02087c8f601a5ace3f5dfe6a58f53d2e2f4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 24 Jun 2011 06:13:48 +0800
Tag:    v2.1.0

Merge branch 's11_MDL-27999_wiki_preview_master' of github.com:dongsheng/moodle

commit 06c8cef4c2419fd7aaf70ba4f908f76aee43c49e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 24 Jun 2011 06:02:20 +0800
Tag:    v2.1.0

Merge branch 'wip-MDL-27962-master' of git://github.com/samhemelryk/moodle

commit fcb36b65ec39d8737da6b49915c076a399fd29e6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 24 Jun 2011 05:57:55 +0800
Tag:    v2.1.0

Merge branch 'wip-MDL-27958-master' of git://github.com/samhemelryk/moodle

commit adecb9de9a13088da6754d00b63228584cf163cf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 24 Jun 2011 05:54:32 +0800
Tag:    v2.1.0

Merge branch 'wip-MDL-27940-master' of git://github.com/samhemelryk/moodle

commit 916cbea67fe22adea9eb09f8581b765a687e1776
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 17:24:03 +0800
Tag:    v2.1.0

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit 5088275347a8ab056af85758fb34dde9e3aee8cc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 17:16:00 +0800
Tag:    v2.1.0

Merge branch 's10_MDL-27341_flickr_plugin_master' of git://github.com/dongsheng/moodle

commit 618d2ecf4884df0b52aa6b0de1ef01ec029dd2ae
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 16:15:07 +0800
Tag:    v2.1.0

Merge branch 'MDL-27920_grade_export' of git://github.com/andyjdavis/moodle

commit 39354db055226b4451b99cf0dd808732c30f4c18
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 08:02:24 +0800
Tag:    v2.1.0

Merge branch 's10_MDL-27341_flickr_plugin_master' of git://github.com/dongsheng/moodle

commit 4c15bde8f1903817c6bec075cab86d64d19077b7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 07:14:19 +0800
Tag:    v2.1.0

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

commit daf4cf26f706508bfddbd35173452d1adead526c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 06:51:16 +0800
Tag:    v2.1.0

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

commit e345969ae20566ad386a73aad547c23fc8b39f6e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 06:46:29 +0800
Tag:    v2.1.0

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

commit e059fa90b1ada5d24824682f88764bdc99beeeed
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 06:43:11 +0800
Tag:    v2.1.0

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

commit 4d05c972ead2e82d46cc0a6e0ea8601e16e40893
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 06:37:13 +0800
Tag:    v2.1.0

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

commit a2854474ce69c01e2ff7d6d7d8c9d20dbbf711d2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 06:34:03 +0800
Tag:    v2.1.0

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

commit 63c4530f0fb8a4049da34d475d87d6951906c899
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 06:29:28 +0800
Tag:    v2.1.0

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

commit aad4048bd7a4ee4e2bd7cb22173bf22afc7ca029
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 06:25:27 +0800
Tag:    v2.1.0

Merge branch 'MDL-27196-hardcodedstrings' of git://github.com/mudrd8mz/moodle

commit d2a5e2278ced2f02ed1b17b77b360b7505fe3b18
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 20:27:46 +0800
Tag:    v2.1.0

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

commit f96147c291d47024535f274757a916fafa62c254
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 20:21:01 +0800
Tag:    v2.1.0

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

commit fc57ca6a546cf519219be18f216364c7f8473418
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 20:15:52 +0800
Tag:    v2.1.0

Merge branch 'MDL-27969-randomallocator' of git://github.com/mudrd8mz/moodle

commit 01acbc42e1c5775727748cf74af07ff66c2310de
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 20:11:18 +0800
Tag:    v2.1.0

Merge branch 'MDL-27073_multilang-custommenu' of git://github.com/mudrd8mz/moodle

commit 1e3ddd6bc41af3dbd082b4a811df4f62cec2c678
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 09:06:14 +0800
Tag:    v2.1.0

Merge branch 's10_MDL-27341_flickr_json_error_master' of git://github.com/dongsheng/moodle

commit 92f753eb99b17840ddbfb3d7ebbb66c53ce2eca3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 08:57:50 +0800
Tag:    v2.1.0

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

commit 96dc283b535f2f3fb084f13937f70c673d89eca2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 08:52:50 +0800
Tag:    v2.1.0

Merge branch 'MDL-27914' of git://github.com/nebgor/moodle

commit 80329900229e6f6f348762bd963ebacdb8c1d252
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 08:35:25 +0800
Tag:    v2.1.0

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

commit 555cc4b4a02d68bd48b5e9fce2288b334dde4f08
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 07:56:30 +0800
Tag:    v2.1.0

Merge branch 'wip-MDL-27810-master' of git://github.com/samhemelryk/moodle

commit 2fc832a1ae361910b8e69d0509502a1193458204
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 07:52:57 +0800
Tag:    v2.1.0

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

commit f5a6bf5e35e138af5d711eb251c887bb10e03bac
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 07:35:15 +0800
Tag:    v2.1.0

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

commit b3c1b5f1a684d51ae5a65fc55ac6d161d1ddfa0d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jun 2011 08:30:37 +0800
Tag:    v2.1.0

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit 9192e9fe45808f5bfa32e6552f07afb070e1325f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jun 2011 05:38:47 +0800
Tag:    v2.1.0

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

commit 5e811bb0007df178bc7d8d3f8d417b167783def7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jun 2011 00:44:08 +0800
Tag:    v2.1.0

Merge branch 's11_MDL-27941_partipants_page_master' of github.com:dongsheng/moodle

commit ca31e935e67d0531b0c088e875a31db8f971ea4b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jun 2011 00:38:42 +0800
Tag:    v2.1.0

Merge branch 'wip-MDL-27899-master' of git://github.com/samhemelryk/moodle

commit aed0dbe70a90ed7e3f492219ac2657b85efa0af6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Jun 2011 23:05:54 +0800
Tag:    v2.1.0

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

commit 8edbfba90969c96b88d5458cba73a31e7b8077d9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Jun 2011 18:48:55 +0800
Tag:    v2.1.0

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

commit 6f9297b48b1d76e669e0d8e9a10f7ddbf3e88fec
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Jun 2011 18:39:19 +0800
Tag:    v2.1.0

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

commit ee37607188a78826334034d9927fed8487b7f883
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Jun 2011 17:56:34 +0800
Tag:    v2.1.0

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

commit f2113d66cd4345c9db40a9dc95463765dcf481d5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Jun 2011 07:26:03 +0800
Tag:    v2.1.0

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

commit b9412668c4fcab20e3576c43f22e97bf25744841
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Jun 2011 07:21:18 +0800
Tag:    v2.1.0

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

commit fd8f24dba833ffc383403cad5446bd2d4c6c6492
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 18 Jun 2011 00:32:00 +0800
Tag:    v2.1.0

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

commit faf1f957acb1c62b46e95165ed7bec481ffdcba2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 17 Jun 2011 23:24:51 +0800
Tag:    v2.1.0

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

commit 3c158ff95e494a6b63cf40175e1fe3f801b9a2ea
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 17 Jun 2011 22:45:30 +0800
Tag:    v2.1.0

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

commit ff30976ad542d3b8be8a1111546f6a4dfdf81d32
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 17 Jun 2011 22:16:58 +0800
Tag:    v2.1.0

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

commit 5df6b3c87e780baf236fa234b510e169f484a335
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 17 Jun 2011 21:32:10 +0800
Tag:    v2.1.0

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

commit 5017d4dc7d7524b0718d307d757a7d87082e1eb5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 17 Jun 2011 21:30:16 +0800
Tag:    v2.1.0

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

commit 7035b80ad902b9fd566f56e5aaffcfe9f5498926
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 17 Jun 2011 07:06:07 +0800
Tag:    v2.1.0

Merge branch 'MDL-27500' of git://github.com/nebgor/moodle

commit 868ca72707c6c1c2d651b2459eb6711a11c906e6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 17 Jun 2011 01:03:16 +0800
Tag:    v2.1.0

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit 5c5f71172a24fd1fb008b91388bd15d35c226bb9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 16 Jun 2011 16:38:49 +0800
Tag:    v2.1.0

Merge branch 'wip-MDL-24355-master' of git://github.com/andyjdavis/moodle

commit 192026f6e503b27fa9b514aec1d7fa1dc9c23072
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 16 Jun 2011 00:18:26 +0800
Tag:    v2.1.0

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

commit 3420de9f978634528dc4aeb76c17b0816b3a650f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jun 2011 20:37:23 +0800
Tag:    v2.1.0

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

commit 84a5f2d26e34007bcdb647d6db2c8a8c14f8e889
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jun 2011 17:59:52 +0800
Tag:    v2.1.0

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

commit 07c4c12b8081597ed80da7cf9eb4c5b4b1bfb5bc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jun 2011 17:25:09 +0800
Tag:    v2.1.0

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

commit 17073fb53a35a991fa2522165795940a0f2fe01c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jun 2011 08:04:50 +0800
Tag:    v2.1.0

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

commit 31c7fbafa6e74d2e5f3b4291668a1d827c8fa335
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jun 2011 08:00:23 +0800
Tag:    v2.1.0

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

commit a16e137f21c42db1d43fb9894431fd47576eacd0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jun 2011 07:30:59 +0800
Tag:    v2.1.0

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

commit 5800c0fde1ebb712324e618ae06d15088c038db9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jun 2011 07:18:05 +0800
Tag:    v2.1.0

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

commit d55ecccb9b1085fa290394623b2690a7a1b02a02
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jun 2011 06:48:56 +0800
Tag:    v2.1.0

Merge branch 'MDL-27848_for_master' of git://github.com/kordan/moodle

commit ee1235e7afe51b7a9d5c5933192108afc93d7147
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jun 2011 04:38:27 +0800
Tag:    v2.1.0

Merge branch 'backup-convert' of git://github.com/mudrd8mz/moodle

commit 90333a972e7e21b0ee814d47e5d9a8c8d677983f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jun 2011 22:57:36 +0800
Tag:    v2.1.0

Merge branch 'wip-mdl-27759-integration-master' of git://github.com/rajeshtaneja/moodle

commit b0635db22989a7e7288028f27eb10b0e94485df5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jun 2011 22:43:07 +0800
Tag:    v2.1.0

Merge branch 'MDL-25461-lang-install-link' of git://github.com/mudrd8mz/moodle

commit 260dd13064c61f0a9bf4d6ede5748f8ebcfe6170
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jun 2011 18:32:47 +0800
Tag:    v2.1.0

Merge branch 'wip-MDL-27825-master' of git://github.com/samhemelryk/moodle

commit e298ec5162f3cb39f74f7afc43ad2053cbb19e53
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jun 2011 18:11:54 +0800
Tag:    v2.1.0

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

commit a0be4a1fcb00ec98021ca63afb991fac208ff950
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jun 2011 01:52:49 +0800
Tag:    v2.1.0

Merge branch 'MDL-27065-workshop-categories' of git://github.com/mudrd8mz/moodle

commit 379f39eb9fd6fc48d34a420cab6d1fae73623860
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 13 Jun 2011 16:12:03 +0800
Tag:    v2.1.0

Merge branch 'MDL-27789-qe2plugins' of git://github.com/mudrd8mz/moodle

commit c7dbcc945203f0a860dbe0e00f9efea9b105cb0c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 09 Jun 2011 07:41:24 +0800
Tag:    v2.1.0

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

commit d92858291a2acd0940e0cde8df114effef1fb414
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 09 Jun 2011 07:20:54 +0800
Tag:    v2.1.0

Merge branch 'wip-MDL-27638-master' of git://github.com/samhemelryk/moodle

commit 2cb791ebc5c968e68bedf1ee57155b44f24f3c0e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 09 Jun 2011 06:59:11 +0800
Tag:    v2.1.0

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

commit 112c26e9ddf1b747ed8c0f20b2138a59bf0b0bc3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 09 Jun 2011 06:36:00 +0800
Tag:    v2.1.0

Merge branch 'wip-MDL-27676-master' of git://github.com/samhemelryk/moodle

commit a6b2f0faf207f42752c71e409f488e71e0f8baca
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 31 May 2011 06:58:34 +0800
Tag:    v2.1.0

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

commit 5b52ce19c5b3c66fcb6024f5add4b94d17308621
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 May 2011 22:37:43 +0800
Tag:    v2.1.0

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

commit 28e2b08582256076212f2c400d1969886d3aeb12
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 May 2011 16:16:10 +0800
Tag:    v2.1.0

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

commit 7a01a2d0cac339860ebc27ee9bd7dec3e740aebb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 23 May 2011 16:29:33 +0800
Tag:    v2.1.0

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

commit 79da959b55e8e9eb3e3a8ad92e4ab42595b5d14b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 May 2011 00:44:16 +0800
Tag:    v2.1.0

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

commit 4d7e02616bc66ff2fdb5ca2a3ea55c4b17a64997
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 May 2011 20:19:23 +0800
Tag:    v2.1.0

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

commit dcc26efb70fcd70ae66f03fb365bec1141d19238
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 May 2011 17:55:04 +0800
Tag:    v2.1.0

Merge branch 'MDL-26704_user_outline_report_master' of git://github.com/andyjdavis/moodle

commit 14c3fd5f83620bb4211091b079e3f62737297aa3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 16 May 2011 15:23:42 +0800
Tag:    v2.1.0

Merge branch 'MDL-26436_close_recordsets_master' of git://github.com/andyjdavis/moodle

commit bed4c52c6729d8536ea2e9c4fc0d1bf48922947a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 16 May 2011 08:45:51 +0800
Tag:    v2.1.0

Merge branch 'MDL-26436_close_recordsets2_master' of git://github.com/andyjdavis/moodle

commit 36da95632280260eaaecac1b417098f2c7a50b08
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 09 May 2011 23:46:22 +0800
Tag:    v2.1.0

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

commit 91a7cd842dd6347004f092e8881933c2ef0ed76c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 09 May 2011 08:04:34 +0800
Tag:    v2.1.0

Merge branch 'wip-MDL-27400-master' of git://github.com/samhemelryk/moodle

commit a8f60a4d586477f172f266831d418ec8b19740f6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 09 May 2011 07:58:38 +0800
Tag:    v2.1.0

Merge branch 'MDL-27317-variable-name-typos' of git://github.com/mudrd8mz/moodle

commit d1380a3c9a7989fdfff38254d3bfc0d4b3e00d1b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 09 May 2011 07:54:46 +0800
Tag:    v2.1.0

Merge branch 'MDL-27372' of git://github.com/nebgor/moodle

commit 3c1ee1042349ca5b23ba071267eae5b15ae39b76
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 09 May 2011 06:58:55 +0800
Tag:    v2.1.0

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

commit 327c24beea1020d71673e0680c997597f44dbff4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 06 May 2011 04:00:58 +0800
Tag:    v2.1.0

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

commit dd0ac53d7a32b5c8c1d9cecc82d986b7e1b5eaa3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 May 2011 22:08:59 +0800
Tag:    v2.1.0

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

commit 5f0ac7652b2fa9050b860b8081b0db1053e0838e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 May 2011 17:18:22 +0800
Tag:    v2.1.0

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

commit bff0e85d377d1b722ffe046c3006e33005dd5fb2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 May 2011 07:08:00 +0800
Tag:    v2.1.0

Merge branch 'MDL-25840' of git://github.com/nebgor/moodle

commit 069e955519234339e5272b180113f1fdc5635988
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 02 May 2011 22:14:05 +0800
Tag:    v2.1.0

Merge branch 'MDL-27293-customlang-timeout' of git://github.com/mudrd8mz/moodle

commit c0977cccd13b747ead34b45dbd069bd104b0401d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 02 May 2011 17:46:10 +0800
Tag:    v2.1.0

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

commit b90b28e2cb40cad6935de85d6da4e152faf369b8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Apr 2011 17:33:46 +0800
Tag:    v2.1.0

Merge branch 'w17_MDL-26249_m21_usercourses' of git://github.com/skodak/moodle

commit 0cd053b40b016431862723e03ed5778e37337ea6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Apr 2011 17:08:05 +0800
Tag:    v2.1.0

Merge branch 'w17_MDL-27253_m21_swfsize' of git://github.com/skodak/moodle

commit 0540e39af9801210fa9ed1671eb775f296fd0d47
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Apr 2011 17:04:39 +0800
Tag:    v2.1.0

Merge branch 'w17_MDL-27263_m21_loggedintypo' of git://github.com/skodak/moodle

commit ff6b4cdb6d7a910cdcb97da0e2594c411f5b0e82
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 18 Apr 2011 17:09:38 +0800
Tag:    v2.1.0

Merge branch 'MDL-26167-master' of git://github.com/agwells/moodle

commit e62ea95dfc05f76312c093b979b9d6099f2a852e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 18 Apr 2011 17:02:09 +0800
Tag:    v2.1.0

Merge branch 'w16_MDL-17344_m21_uploadprof' of git://github.com/skodak/moodle

commit 97fefd2386f6dc6820216e7bc77ffbf62941317e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 18 Apr 2011 07:15:56 +0800
Tag:    v2.1.0

Merge branch 'w16_MDL-27148_m21_stringinc' of git://github.com/skodak/moodle

commit dd92611ec5af147339641b7dc0937450c02bd9e4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 18 Apr 2011 07:10:29 +0800
Tag:    v2.1.0

Merge branch 'w16_MDL-27217_m21_tinyset' of git://github.com/skodak/moodle

commit 47f89dc8a623016275487125172fe0561812a092
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 18 Apr 2011 07:02:23 +0800
Tag:    v2.1.0

Merge branch 'w16_MDL-27220_m21_tagprofile' of git://github.com/skodak/moodle

commit 9ff913b716a55961c67ae4afe072a34995676d22
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Apr 2011 23:48:29 +0800
Tag:    v2.1.0

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

commit 72e97b58806a5a547d9547ac85a9bccf4b5bc15e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Apr 2011 21:55:33 +0800
Tag:    v2.1.0

Merge branch 'w15_MDL-26577_m21_groupscleanup' of git://github.com/skodak/moodle

commit af58cf7d4023e5b73998ca044dcd4de841249441
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Apr 2011 21:15:40 +0800
Tag:    v2.1.0

Merge branch 'w15_MDL-26805_m21_userpol' of git://github.com/skodak/moodle

commit 920234498ee3823a22d9dd36eb474a886aa8ecd6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Apr 2011 17:18:23 +0800
Tag:    v2.1.0

Merge branch 's9_MDL-27098_filemanager_strings_master' of git://github.com/dongsheng/moodle

commit 43f8192a656e8a525fe8a7c1e6077b007c75dce9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Apr 2011 17:06:30 +0800
Tag:    v2.1.0

Merge branch 'w15_MDL-25826_m21_htmlpurifier' of git://github.com/skodak/moodle

commit b34324a73e78c1122cac8bd138ced2aec8d2d6fd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Apr 2011 07:33:17 +0800
Tag:    v2.1.0

Merge branch 'w15_MDL-27094_m21_assval' of git://github.com/skodak/moodle

commit 11ea5b96a8f7711c8cdfb0d81871e178415ae07b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Apr 2011 07:20:41 +0800
Tag:    v2.1.0

Merge branch 'w15_MDL-27007_m21_userupload' of git://github.com/skodak/moodle

commit 90bf8b535bea0f3de49a898a162564e2b838879b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Apr 2011 06:14:05 +0800
Tag:    v2.1.0

Merge branch 'w15_MDL-26910_m21_httpd' of git://github.com/skodak/moodle

commit 12257f2c390d6d8daddd65641364c0600acc078b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Apr 2011 05:54:21 +0800
Tag:    v2.1.0

Merge branch 'w15_MDL-27121_m21_phpreq' of git://github.com/skodak/moodle

commit fa81a032572842cc169a64ae2fe5033fac999f2a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Apr 2011 05:51:26 +0800
Tag:    v2.1.0

Merge branch 'MDL-26319' of git://github.com/nebgor/moodle

commit b5f9a6d302e8b5437943187802b60ee43f200b2d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Apr 2011 05:41:01 +0800
Tag:    v2.1.0

Merge branch 'mdl27084' of git://github.com/tlevi/moodle

commit 21473e6cd746e44dfc1f25b036981238debf69f2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Apr 2011 05:21:49 +0800
Tag:    v2.1.0

Merge branch 'wip-MDL-26560-master' of git://github.com/samhemelryk/moodle

commit b76070db70a20e89899dc9c53eef89b411574cab
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Apr 2011 03:53:17 +0800
Tag:    v2.1.0

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

commit a7174151dbcea35a2945045212d4a98e2c1a6231
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 04 Apr 2011 18:35:04 +0800
Tag:    v2.1.0

Merge branch 'MDL-11288-course-module-cloning' of git://github.com/mudrd8mz/moodle

commit 4102345add02ad399588763fd5ea9daff20ecb2b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 04 Apr 2011 18:00:30 +0800
Tag:    v2.1.0

Merge branch 'master' of git.moodle.org:/git/integration

commit a70ba1b0696f74c4a9992cc57ed0b09d9c89c054
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 04 Apr 2011 17:56:44 +0800
Tag:    v2.1.0

Merge branch 'MDL-26931-blog-post-order_master' of git://github.com/mudrd8mz/moodle

commit a5743e866eec902edffb602a9f84d55877df4405
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Mar 2011 05:33:23 +0800
Tag:    v2.1.0

Merge branch 'w13_MDL-22733_21_youtubeiframe' of git://github.com/skodak/moodle

commit 5e44c5c998b427246960f9d166d47cf3d905fed5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Mar 2011 04:08:15 +0800
Tag:    v2.1.0

Merge branch 'w13_MDL-26909_21_mediatests' of git://github.com/skodak/moodle

commit 12abf305f850a7721a9b92e9219bea04837a2778
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Mar 2011 03:56:25 +0800
Tag:    v2.1.0

Merge branch 'w13_MDL-26987_21_sclean' of git://github.com/skodak/moodle

commit 63d6da51fe7561e7ab51aaf1357adda3252cde5d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Mar 2011 01:58:49 +0800
Tag:    v2.1.0

Merge branch 'w13_MDL-26913_20_sitecreated' of git://github.com/skodak/moodle

commit 2326b8d3018d3f2c7d0bff84485115adff30cbf3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Mar 2011 01:38:48 +0800
Tag:    v2.1.0

Merge branch 'w13_MDL-26951_21_archetypes' of git://github.com/skodak/moodle

commit 18318237d741a7326ce88419823705498135bec1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Mar 2011 01:25:03 +0800
Tag:    v2.1.0

Merge branch 'w13_MDL-26991_21_legacy' of git://github.com/skodak/moodle

commit 0a284930cfb4100e453de6841a2afa6346a14715
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Mar 2011 01:05:07 +0800
Tag:    v2.1.0

Merge branch 'w13_MDL-26966_21_urlparsing' of git://github.com/skodak/moodle

commit 58937f7e577c621fe10bed268d73da5b9357829c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Mar 2011 00:09:29 +0800
Tag:    v2.1.0

Merge branch 'w13_MDL-26985_21_branching' of git://github.com/skodak/moodle

commit 37c2a8a0354d8f5929d6084a01589513da25b309
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 28 Mar 2011 22:21:11 +0800
Tag:    v2.1.0

Merge branch 'master' of git.moodle.org:/git/integration

commit a22672723806c734c2219fd5ea8ede6c01236f50
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 28 Mar 2011 22:07:20 +0800
Tag:    v2.1.0

Merge branch 'w13_MDL-26990_21_missingrebuild' of git://github.com/skodak/moodle

commit df8248b035c1f7a139bcd9693072930aac8a1eeb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 28 Mar 2011 20:48:38 +0800
Tag:    v2.1.0

Merge branch 'MDL-26804-langlistcache_master' of git://github.com/mudrd8mz/moodle

commit e1feb94cd1dcad7424ffdc9f141ee4604bc000af
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 28 Mar 2011 17:48:58 +0800
Tag:    v2.1.0

Merge branch 's8_MDL-26213_wiki_rewrite_file_url' of git://github.com/dongsheng/moodle

commit b431645c890a9c3fef3b8dab77d8f58b6bd0996e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 28 Mar 2011 17:03:44 +0800
Tag:    v2.1.0

Merge branch 'MDL-26932' of git://github.com/jennymgray/moodle

commit 12c6a556b2b4a0853d7e87ceafc20bd2fe8a362b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 28 Mar 2011 16:48:45 +0800
Tag:    v2.1.0

Merge branch 'm20_MDL-26939_plagiarism_restore' of git://github.com/danmarsden/moodle