Developer credits

Git merges in Moodle 2.1.5 by Eloy Lafuente (stronk7)

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