Git merges in Moodle 2.0.5 by Eloy Lafuente (stronk7)

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

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 51acffb94a87d20862ee9f13a436789db54ecac6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Oct 2011 07:15:06 +0800
Tag:    v2.0.5

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

commit 74126d6d3e8797496adf8c48afec87e0ebb5deee
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Oct 2011 07:10:40 +0800
Tag:    v2.0.5

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

commit d5ca7b11b71edc68f830619d90c5b5cf3b9be779
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Oct 2011 18:48:30 +0800
Tag:    v2.0.5

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

commit 33091e7e582a48eb38728a4397b3678309371f46
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Oct 2011 18:13:09 +0800
Tag:    v2.0.5

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

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

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit fff222f460462df4ea03572367c091dd5a744c02
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 27 Sep 2011 05:57:51 +0800
Tag:    v2.0.5

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

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

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

commit aa114967bb41111facae2e17da5aec264e9897c6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 27 Sep 2011 04:37:51 +0800
Tag:    v2.0.5

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

commit e60ca6985b1c35ec7a1f0eef2835e2cf1b1bf431
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 27 Sep 2011 04:22:04 +0800
Tag:    v2.0.5

Merge branch 'MDL-29201_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit b506a6f08e88bce05f58b844942efe854467450f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 27 Sep 2011 03:45:15 +0800
Tag:    v2.0.5

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

commit 0ca9b41b50b740e6350d75feef63e34e89b13e60
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 21 Sep 2011 23:04:56 +0800
Tag:    v2.0.5

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 387bde00c25bbbeec1b369f360b5df5db4ffc339
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 21 Sep 2011 06:11:35 +0800
Tag:    v2.0.5

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

commit eebe41c9d3a2ff9202c9b1d8a3e95e5b08900296
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 20 Sep 2011 15:51:44 +0800
Tag:    v2.0.5

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

commit 2bc77f9cc9a16adde417b6adb168e99c9339f4ca
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 20 Sep 2011 06:18:03 +0800
Tag:    v2.0.5

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

commit 439de8cf42e096fc5165bdd7fec3fd3976621ba6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 20 Sep 2011 05:36:35 +0800
Tag:    v2.0.5

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

commit c1beb0fa2d3c3d053fcc547fec3b2e096ce3d41d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 20 Sep 2011 05:33:55 +0800
Tag:    v2.0.5

Merge branch 'MDL-27298_forum_rating_participants' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE

commit 77962f179e70d44c444807d3ee1843173a0539db
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 16 Sep 2011 07:34:52 +0800
Tag:    v2.0.5

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

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

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

commit bede2a2a3491b325baa2fcda413180f9b81fbb17
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 06 Sep 2011 08:00:12 +0800
Tag:    v2.0.5

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

commit 85ae284e59ab87227eba2c1bb7e5c8715f98c8bc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 06 Sep 2011 07:28:28 +0800
Tag:    v2.0.5

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

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

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

commit 724641e59a0617dd166e6a140a033605d606861a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 31 Aug 2011 07:29:52 +0800
Tag:    v2.0.5

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit b7424c7693e121c142f6bc0a6457aadd7a243bdc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2011 19:02:27 +0800
Tag:    v2.0.5

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

commit 081d16475ba905ed75e4d0cf6d2abd88a56abc77
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2011 16:31:34 +0800
Tag:    v2.0.5

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

commit 22a35ffaafa6da64253a955389bb2fb6c62ab0c4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2011 09:23:45 +0800
Tag:    v2.0.5

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

commit 00f706d1f571e86176ae82b46157a038e56850f5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2011 08:53:08 +0800
Tag:    v2.0.5

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

commit 28883e9b4508bec8ceb15e0079dbf56126ff7640
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2011 07:22:58 +0800
Tag:    v2.0.5

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

commit 6a10905864e6eceb0f5f01f1596487fda249a4c9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 26 Aug 2011 20:57:03 +0800
Tag:    v2.0.5

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit d52f9563d1027bd01ea31355159fe296113185c8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 25 Aug 2011 16:47:31 +0800
Tag:    v2.0.5

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

commit de8c58715a5a32968f44a37e62010e8568286cc2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 25 Aug 2011 07:16:38 +0800
Tag:    v2.0.5

Merge branch 'MDL-28650-MOODLE_20_STABLE' of https://github.com/mouneyrac/moodle into MOODLE_20_STABLE

commit d45e51753816812be23fd19ba44cdef1abd5cb06
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 09:52:26 +0800
Tag:    v2.0.5

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

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

Merge branch 'm20_MDL-28962' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE

commit 91d77b17bd454e98fa5dd9c94e08a1d2579fe175
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Aug 2011 23:31:45 +0800
Tag:    v2.0.5

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

commit 68e22328b512973b28bb88c849e529970382e5d7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Aug 2011 08:50:21 +0800
Tag:    v2.0.5

Merge branch 'm20_MDL-28999' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE

commit 13c04d170127aafc439a2869bbcb25223024bb5e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Aug 2011 08:05:33 +0800
Tag:    v2.0.5

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

commit bf3e4e030f3b93d148bdf42931973fa0446e674c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Aug 2011 07:42:48 +0800
Tag:    v2.0.5

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

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

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

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

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 14f9c0cbcd99fd3cfada8dd2c2fd393b919dec42
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 18 Aug 2011 07:43:05 +0800
Tag:    v2.0.5

Merge branch 'm20_MDL-28971' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE

commit c7cce21d67f2ac392759c1144f3058930bdbc62a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 09:00:59 +0800
Tag:    v2.0.5

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

commit be3aba207edbc0429e8e4e3c8315322603b24001
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 08:52:25 +0800
Tag:    v2.0.5

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

commit 780cdcea5fb23a5e4c4b44f7f41720767e460308
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 07:02:39 +0800
Tag:    v2.0.5

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

commit c2fe54c2364efbe1b7cc7134f6e6a9b545f9c300
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 06:35:07 +0800
Tag:    v2.0.5

Merge branch 'm20_MDL-28649' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE

commit 664a07f74e9d2043d4040338698548c9e6224396
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 05:44:32 +0800
Tag:    v2.0.5

Merge branch 'm20_MDL-28721' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE

commit bf479611db9597ea99e0d3bb35807daa48d04292
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 19:17:12 +0800
Tag:    v2.0.5

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

commit 1f52e72526c305989eadc702b5299edb2a50ac3c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 17:52:12 +0800
Tag:    v2.0.5

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

commit 9a287f8a49a1b4df0189f19c02aa6d1c4ad8a3f4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 09:06:31 +0800
Tag:    v2.0.5

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

commit 76a07a1da53c7b00bb91188b66f20715acffc050
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 08:15:18 +0800
Tag:    v2.0.5

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

commit 46894c5058d45a925d5a8faeda302c7b86911f69
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 08:08:04 +0800
Tag:    v2.0.5

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

commit 75e815fe72d5132eb469d882e13587581822e3da
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 08:01:48 +0800
Tag:    v2.0.5

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

commit 8634bb229e0566a09f28173323ddf46dab8776b7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 06:39:41 +0800
Tag:    v2.0.5

Merge branch 'm20_MDL-25757' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE

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

Merge branch 'm20_MDL-28603' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE

commit 6e4ece5640f6942d4fb94115fd1b48b9fffa12aa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 01:35:22 +0800
Tag:    v2.0.5

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

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

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 55ffbabe6d613a6551dd86a62a4603cca2f5431c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Aug 2011 04:59:47 +0800
Tag:    v2.0.5

Merge branch 'm20_MDL-28295' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE

commit e8a165d2a3255e0b0c5e6fa233b5046c8694cd4e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Aug 2011 08:49:28 +0800
Tag:    v2.0.5

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

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

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

commit 2bdfe77686dae806514a05f7d5dba1aaec3a8c4c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Aug 2011 07:12:11 +0800
Tag:    v2.0.5

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

commit 1b8b39cbde9dfba82ea9784c1604757f50a76c62
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Aug 2011 16:16:14 +0800
Tag:    v2.0.5

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

commit c874785067a231dffbd249a18ca8d1c73855f56c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Aug 2011 15:43:23 +0800
Tag:    v2.0.5

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