Git merges in Moodle 2.1.2 by Eloy Lafuente (stronk7)

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