Git merges in Moodle 2.1.x by Aparup Banerjee

commit 56f9e592417e5c7748f3be7255656a9d2590c832
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 26 Jul 2012 14:04:26 +0800
Tag:    v2.1.8

Merge branch 'install_21_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_21_STABLE

commit b693256a99db59768964ee60985df116f348d72a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 24 Jul 2012 11:18:59 +0800
Tag:    v2.1.8

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

commit 236534f192513dd3b7bb1188c3b07722abe0c7f5
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 20 Jun 2012 17:18:46 +0800
Tag:    v2.1.7

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

commit 9a36598bac36a51f9a75f2b97d64793cd5c5b1c7
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 12 Jun 2012 11:28:11 +0800
Tag:    v2.1.7

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

commit b10a4873341163808f4f00044e51b78bdb619329
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 11 Jun 2012 13:56:03 +0800
Tag:    v2.1.7

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

commit 97f8f66cc3ec886d5d5a5af8012aee269eb18b3d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 05 Jun 2012 15:16:14 +0800
Tag:    v2.1.7

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

commit 323d76708b7bcc56a34748c8f6ffc2e09bf8bdab
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 31 May 2012 15:18:16 +0800
Tag:    v2.1.7

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

commit 3a2d36354281a76398aaad0e11d65a5c6e8e74d8
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 31 May 2012 14:15:59 +0800
Tag:    v2.1.7

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

commit 65a312fa32bb95bc76e355cee58c557127b3f664
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 24 May 2012 15:45:03 +0800
Tag:    v2.1.7

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

commit 3cf17d040e1564e72e6afa7a61e2882196dc8fe0
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 16 May 2012 16:06:23 +0800
Tag:    v2.1.7

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

commit d9e11780303dbee926ae6eeb36e4f6c3896e4c85
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 16 May 2012 14:11:20 +0800
Tag:    v2.1.7

Merge branch 'wip-MDL-32991-MOODLE_21_STABLE' of git://github.com/abgreeve/moodle into MOODLE_21_STABLE

commit 6030656b88971236b95448e66fd243192a1e424a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 15 May 2012 16:18:53 +0800
Tag:    v2.1.7

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

commit 336c4263e934faa880a137373d42d85e82ac30b3
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 15 May 2012 11:09:13 +0800
Tag:    v2.1.7

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

commit dbcfd4f152939ea464e45bc97aef16ee3a794b22
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 02 May 2012 13:55:58 +0800
Tag:    v2.1.6

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

commit a0e75f0360cf51bc56d1ef81cec5428a3bc79934
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 05 Apr 2012 16:20:03 +0800
Tag:    v2.1.6

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

commit 69d01769231312016601042cf2195a5bd1ed5d34
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 04 Apr 2012 13:41:04 +0800
Tag:    v2.1.6

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

commit e496f11da2eff1c652a6eefe2673d42562327cdf
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 03 Apr 2012 17:34:54 +0800
Tag:    v2.1.6

Merge branch 'w14_MDL-32141_m21_tinymce' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit a0bf1073c5d683a54cc446af62ecc09c83b3c471
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 03 Apr 2012 17:01:02 +0800
Tag:    v2.1.6

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

commit 3d060749536339d25925675a13bca2bfb4ac22a8
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 27 Mar 2012 10:10:31 +0800
Tag:    v2.1.6

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

commit c8f95660ff265480172d7f9b72bc8d4734eb0e51
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 20 Mar 2012 16:12:31 +0800
Tag:    v2.1.6

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

commit 49e45d069b32af8323322671b887223102ada227
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 20 Mar 2012 10:10:44 +0800
Tag:    v2.1.6

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

commit a5d7e18abe554e17cd9eb7703cddd70f2649bcb8
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Mar 2012 15:30:48 +0800
Tag:    v2.1.6

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

commit 361492a8069041f81113a5835ce6d2fc98566c1a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Mar 2012 11:52:42 +0800
Tag:    v2.1.6

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

commit e785ca696ee8c5ad9e22a4e5175bfa424b508862
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Mar 2012 11:32:44 +0800
Tag:    v2.1.6

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

commit 91c54c7c1102de1eb4b25099b41bfa4ba7a14d6e
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Feb 2012 16:42:02 +0800
Tag:    v2.1.5

Merge branch 'MDL-14837_show-time-on-no-duration-events_21_STABLE' of https://github.com/ncsu-delta/moodle into MOODLE_21_STABLE

commit fdbdba153bc98f41546ca5520413826057dd99c9
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Feb 2012 15:38:56 +0800
Tag:    v2.1.5

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

commit e46da9a7fe4fc0f6ab452d1d8768e58addbfaa56
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Feb 2012 14:42:24 +0800
Tag:    v2.1.5

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

commit 8b1876f3b554255c66cf8b394814ca5b6ad3812d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Feb 2012 14:15:43 +0800
Tag:    v2.1.5

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

commit 4c52d60ed4106837ac42c719ce300998c178a159
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Feb 2012 13:48:45 +0800
Tag:    v2.1.5

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

commit 40e24058b2d5458c75eb65ae9bb0b4be683131b6
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Feb 2012 12:05:25 +0800
Tag:    v2.1.5

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

commit b6aa60c8104d73b086de24b694ba7c3e787b2fc4
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 14 Feb 2012 15:39:10 +0800
Tag:    v2.1.5

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

commit 38a88bb4bc73ae744bb651a15cd8f20f9cc0924b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 14 Feb 2012 11:43:15 +0800
Tag:    v2.1.5

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

commit fa639fef7aad47dde3f422f21311d535283b4f38
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 09 Feb 2012 10:17:01 +0800
Tag:    v2.1.5

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

commit 60811b8dc9784565521160166dc7c83fe25cc345
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 08 Feb 2012 11:27:50 +0800
Tag:    v2.1.5

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

commit 7acc25342a3b905e10e727cb84509cd8de4fbc08
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 08 Feb 2012 09:59:36 +0800
Tag:    v2.1.5

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

commit dbc410767ad7d8a0c999bd249dbcd476b4f03ef5
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 07 Feb 2012 16:37:11 +0800
Tag:    v2.1.5

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

commit e77a77bbf5e70f5d9f1c1f1fb39a9088ab9441b5
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 07 Feb 2012 15:12:50 +0800
Tag:    v2.1.5

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

commit 49b52b3fb4bf62a42bf08f9daa3bcd62f83e6cac
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 31 Jan 2012 16:51:47 +0800
Tag:    v2.1.5

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

commit 5d8d3a1a08f549d98370e4a762818acc9e3e6892
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 31 Jan 2012 16:44:07 +0800
Tag:    v2.1.5

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

commit 21defa3d5e0429350407bdb7292c54f7be07a3d7
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 31 Jan 2012 14:36:54 +0800
Tag:    v2.1.5

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

commit 05b6988a0a2a37d5713b97275cf7c2a427d73c35
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 31 Jan 2012 11:52:34 +0800
Tag:    v2.1.5

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

commit 2cd7d23056dcbd352348b61d63e44d78c3203553
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 31 Jan 2012 11:16:09 +0800
Tag:    v2.1.5

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

commit 8cbc3946a399be36bdb5eefe6915bdbf230a8bf9
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 30 Jan 2012 16:27:26 +0800
Tag:    v2.1.5

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

commit b69e249a6dbf36436d713d2036a0415aece5d7ba
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 30 Jan 2012 12:50:51 +0800
Tag:    v2.1.5

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

commit 87c259ce02abcc03b4d8e3d33ba1abd967f5ba96
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 24 Jan 2012 23:02:12 +0800
Tag:    v2.1.5

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

commit 5528fbe8803cf31e0672fefbd753ce1a69c3d697
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 24 Jan 2012 07:17:18 +0800
Tag:    v2.1.5

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

commit bfa2605567cf52b7ddaade423342c3b980ae5d8c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 24 Jan 2012 06:59:17 +0800
Tag:    v2.1.5

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

commit df2842cc6beb4c2123b2cb1e26a404aaf02b8969
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 16 Jan 2012 15:31:36 +0800
Tag:    v2.1.5

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

commit 7741d150c9d0e45eaac840fb9035ec5279d00665
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 16 Jan 2012 14:58:49 +0800
Tag:    v2.1.5

Merge branch 'w03_MDL-30003_m21_userstats' of https://github.com/skodak/moodle into MOODLE_21_STABLE

commit 4d47200557b8a0b4c12131171fec39efdad0b185
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 09 Jan 2012 12:21:40 +0800
Tag:    v2.1.5

Merge branch 'w02_MDL-30718_m21_usertimedb' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 869e613aea06d0ad4810b97d110509710811a087
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 03 Jan 2012 12:32:20 +0800
Tag:    v2.1.4

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

commit 0d3504b4bb7a172913711f1ee5f18c444a2f5e04
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 21 Dec 2011 14:17:39 +0800
Tag:    v2.1.4

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

commit ee7f8610dbab1aa51b53f282f8fa9e2956310552
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 21 Dec 2011 13:24:43 +0800
Tag:    v2.1.4

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

commit 364622b4662d9f349f3701ed548cda2f31491fea
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 21 Dec 2011 11:32:41 +0800
Tag:    v2.1.4

MDL-28126 webservice : resolved integration conflicts

commit 88d3c04840d4e200819575cca13b8c7ba4c610bb
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 20 Dec 2011 19:16:12 +0800
Tag:    v2.1.4

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

commit 4b61488d0fa14d11df09c17868bf7583f1d96315
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 20 Dec 2011 11:11:46 +0800
Tag:    v2.1.4

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

commit 9822be6f4c173eb5f4a13a8c4ffba40e192acd6a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Dec 2011 17:07:56 +0800
Tag:    v2.1.4

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

commit 8f10c31083d218ffde2eff966a99a0df7e3d62f7
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Dec 2011 14:38:01 +0800
Tag:    v2.1.4

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

commit 552390c5c5d2c7eb606a11dc5b7fe1ad42687f2b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 09 Dec 2011 15:27:21 +0800
Tag:    v2.1.4

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

commit 808a7622b9aa3b78f280f2a088f1b7d5be451a51
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 09 Dec 2011 10:48:04 +0800
Tag:    v2.1.4

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

commit 4d642dc1b2b0e6db43b171853d79a7c416c35363
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 08 Dec 2011 16:20:32 +0800
Tag:    v2.1.4

Merge branch 'wip-MDL-30336-MOODLE_21_STABLE' of git://github.com/abgreeve/moodle into MOODLE_21_STABLE

commit 2874fc880f1c8153b3e0cca6813aa1c2172ade54
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 08 Dec 2011 15:55:25 +0800
Tag:    v2.1.4

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

commit 47ec4ba7d849d08e4cfdbb5f1464a9c5b423ace1
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 08 Dec 2011 14:05:45 +0800
Tag:    v2.1.4

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

commit 65bf17ee241ffa4c5f2e6d347cca1e6f4c17e5bc
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 08 Dec 2011 13:48:45 +0800
Tag:    v2.1.4

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

commit 759a28d97b9a10fb55b09c3b433467e8e763793d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 08 Dec 2011 13:40:10 +0800
Tag:    v2.1.4

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

commit cd0b9e040f49b77969d04800abf34a0c719290bb
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 01 Dec 2011 11:26:52 +0800
Tag:    v2.1.4

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

commit b5c3eee58e5af7af0a3c2d2d38602ecf36a78bb9
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 30 Nov 2011 15:18:28 +0800
Tag:    v2.1.4

Merge branch 'wip-MDL-27334-MOODLE_21_STABLE' of git://github.com/abgreeve/moodle into MOODLE_21_STABLE

commit fc51860a032b0ebf105dad09a21036ecc34d8adc
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 30 Nov 2011 14:42:59 +0800
Tag:    v2.1.4

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

commit ecbbcd5e07405582d082b76d344d62788b2ffe71
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 30 Nov 2011 14:11:50 +0800
Tag:    v2.1.4

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

commit 28f8069eb5ea76f11576e31c806cb4fd46e10e7f
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 28 Nov 2011 11:48:30 +0800
Tag:    v2.1.4

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

commit babd54537cb5975ea3a5f0409ca3718107599e98
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 24 Nov 2011 16:14:53 +0800
Tag:    v2.1.3

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

commit f0a173ff75e91a8384ae99aa33f06eafca1c0b09
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 24 Nov 2011 14:45:24 +0800
Tag:    v2.1.3

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

commit 72b19bafdba96677db8b14f6cb60b0317d2e8f4e
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 23 Nov 2011 11:13:57 +0800
Tag:    v2.1.3

Merge branch 'wip-MDL-20627-MOODLE_21_STABLE' of git://github.com/abgreeve/moodle into MOODLE_21_STABLE

commit d81e6cc96e5c6df9eaef2c32a5f6493f9845a126
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Nov 2011 17:17:40 +0800
Tag:    v2.1.3

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

commit f0c67f5f0218d1913f299b36fdb9cd2fbd3211de
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Nov 2011 16:17:44 +0800
Tag:    v2.1.3

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

commit 52f04e91a1b6be186d15b9eee50f23720980f2d7
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Nov 2011 16:10:29 +0800
Tag:    v2.1.3

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

commit da86b5661510817cee46531871e3d6aaa10709ff
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Nov 2011 14:25:06 +0800
Tag:    v2.1.3

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

commit 7d584b168bb092a15552fec238060a095572e421
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Nov 2011 01:21:31 +0800
Tag:    v2.1.3

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

commit 2823fe83d9259413a5b97c878e0bc2346c6d8737
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 21 Nov 2011 14:02:52 +0800
Tag:    v2.1.3

Merge branch 'wip-MDL-30289-MOODLE_21_STABLE' of git://github.com/abgreeve/moodle into MOODLE_21_STABLE

commit d047cf60aeb5dd7b1217e6c80a7484a238a45e50
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 21 Nov 2011 11:52:39 +0800
Tag:    v2.1.3

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

commit de3476d17162914763fd4d2c762b7c018a17a3cb
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 11 Nov 2011 17:00:56 +0800
Tag:    v2.1.3

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

commit 7159b53324a172620e8f51aae2047054bc244bb6
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 11 Nov 2011 11:26:44 +0800
Tag:    v2.1.3

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

commit 0eb0583d9d56f35cb6e33c9c5751f3c95632fb7e
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 09 Nov 2011 17:55:17 +0800
Tag:    v2.1.3

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

commit bc1f567d38766571924d0f4bf437a4a25a469d53
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 09 Nov 2011 13:38:53 +0800
Tag:    v2.1.3

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

commit 07340448fe675e5c39aa332e761ecf8441b5f727
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 09 Nov 2011 13:04:02 +0800
Tag:    v2.1.3

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

commit bace4ce456c8af7be199a67bd18f894bf353f147
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 09 Nov 2011 11:04:40 +0800
Tag:    v2.1.3

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

commit 3aed25accdc95013e17ade536a28c33fc75ce4ea
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 08 Nov 2011 20:35:21 +0800
Tag:    v2.1.3

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

commit b57566d3beeaf1c2f74e0584ee5fae7acd780bc5
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 08 Nov 2011 16:48:40 +0800
Tag:    v2.1.3

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

commit 40b90130a031ab2edc35237f652e3f33de948583
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 08 Nov 2011 15:18:42 +0800
Tag:    v2.1.3

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

commit f598387441a16c6a085fcc2b6919ac1b63e28874
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 08 Nov 2011 14:51:20 +0800
Tag:    v2.1.3

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

commit 3e99f27558ec54898e44d678d2f69fd7680dff5c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 08 Nov 2011 11:45:33 +0800
Tag:    v2.1.3

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

commit a49a4aecb2c829960af390d0446c68a9d88fc7db
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 08 Nov 2011 11:38:29 +0800
Tag:    v2.1.3

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

commit d4d070fc35f422dbea35f524820710dcd78ce268
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 08 Nov 2011 11:30:06 +0800
Tag:    v2.1.3

Merge branch 'MDL-30154_21_wip' of git://github.com/grabs/moodle into MOODLE_21_STABLE

commit c8805386845fc6a4101390be15a8847530b28061
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 01 Nov 2011 15:19:51 +0800
Tag:    v2.1.3

Merge branch 'w43_MDL-30005_m21_uri' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 65af1129c5261c904a3980dcaa4569b1e041e993
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 01 Nov 2011 12:16:10 +0800
Tag:    v2.1.3

Merge branch 'w43_MDL-29990_m21_navcontinue' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit df1d01c9f7fee21fdd2463cf02864c501feb5c47
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 01 Nov 2011 12:07:22 +0800
Tag:    v2.1.3

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

commit 2d930dc6dd597945ccba0371b406946192a8a6f0
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 31 Oct 2011 16:05:51 +0800
Tag:    v2.1.3

Merge branch 'w43_MDL-29966_m21_grouploading' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 4f14428adcb0ad9d977dc398811cd6c88afa78e6
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 31 Oct 2011 15:26:09 +0800
Tag:    v2.1.3

Merge branch 'w43_MDL-29984_m21_enroltoday' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 340aa2008fb407fa187e1e2dd59bb4e606c60698
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 31 Oct 2011 15:17:15 +0800
Tag:    v2.1.3

Merge branch 'w43_MDL-30005_m21_uri' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 3cc9205676b036f51baab40d51a3d56491750e4c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 24 Oct 2011 17:05:39 +0800
Tag:    v2.1.3

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

commit 3d336f22649ce2e9a887d90ceffc2fd95017dd79
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 24 Oct 2011 16:43:21 +0800
Tag:    v2.1.3

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

commit fdb8574046588d3d606babd86e00c82ab8272e0b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 24 Oct 2011 14:49:35 +0800
Tag:    v2.1.3

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

commit 8eb6f9f7a749c163629787071220f18f66ee3272
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 24 Oct 2011 13:52:51 +0800
Tag:    v2.1.3

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

commit b35dc1beb7c699aa0b96ae5286fa285dd84041dd
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 24 Oct 2011 13:06:58 +0800
Tag:    v2.1.3

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

commit 42f5db3ca819cf8bf8756c28f9f39f5d989a9f09
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 11 Oct 2011 11:24:56 +0800
Tag:    v2.1.3

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

commit 4b7783da19ac5a4649fb3469d9f93227fb4229ac
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 11 Oct 2011 09:45:06 +0800
Tag:    v2.1.3

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

commit 489f5b1338ba4a478991153280781ffdcfaad9ca
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 11 Oct 2011 09:27:29 +0800
Tag:    v2.1.3

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

commit 415c4ee04f21378fd9b12a3546d1e96751650279
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 10 Oct 2011 23:14:42 +0800
Tag:    v2.1.3

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

commit 1d6bb3a8974d7c2d883739dc65bd010cfe268eaa
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 10 Oct 2011 22:46:33 +0800
Tag:    v2.1.3

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

commit e153abc018c29b51b31c7349b6ab1dc14b0e5379
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 05 Oct 2011 14:52:45 +0800
Tag:    v2.1.2

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

commit c6e321ccaf15270b787954b4698928d52bde4b0e
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 03 Oct 2011 16:01:00 +0800
Tag:    v2.1.2

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

commit 30ed26a57615a539f74c2e257e3a65941a459235
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 03 Oct 2011 14:29:46 +0800
Tag:    v2.1.2

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

commit 4cb89f4df4272a815c898305a3c1e330701dc261
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 03 Oct 2011 13:54:09 +0800
Tag:    v2.1.2

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

commit e9be98eed2e129390b11612fdd3f21930f92d402
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 27 Sep 2011 15:00:49 +0800
Tag:    v2.1.2

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

commit ca92a99a2e082df2996969d2e884027dc8e86552
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 27 Sep 2011 11:35:44 +0800
Tag:    v2.1.2

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

commit 3cef27bf9f45cab32301ddcfcd2e3e1d26a44c00
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 26 Sep 2011 17:04:28 +0800
Tag:    v2.1.2

Merge branch 'MDL-29270-question-grade_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit 8daff43635847ab0dd98e6f79d6f51933a822f56
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 26 Sep 2011 16:01:11 +0800
Tag:    v2.1.2

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

commit e90206aaa49cdf609fc1bbe17404f72931b2cd8e
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 26 Sep 2011 14:49:21 +0800
Tag:    v2.1.2

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

commit b967bf600556be6d1f1fb98a553e30b7186be6ba
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 26 Sep 2011 14:07:25 +0800
Tag:    v2.1.2

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

commit 14312ebc6a7fb5546cd69236f8e48ba74d7252ff
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 20 Sep 2011 13:17:00 +0800
Tag:    v2.1.2

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

commit a886ad10eaed95a39583570a5099bc3f21b3a64f
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 20 Sep 2011 10:20:38 +0800
Tag:    v2.1.2

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

commit bc24c20388ded7b89cd10ba99df07fce60b18494
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 19 Sep 2011 16:13:31 +0800
Tag:    v2.1.2

Merge branch 's13_MDL-29036_ws_upload_21' of git://github.com/dongsheng/moodle into MOODLE_21_STABLE

commit 8104e0f2df37b2db4035a691184b063f63080f0b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 19 Sep 2011 12:15:00 +0800
Tag:    v2.1.2

Merge branch 's13_MDL-28509_youtube_21' of github.com:dongsheng/moodle into MOODLE_21_STABLE

commit edb8077e7bf153c1ac7782439a1357d1aac13b72
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Sep 2011 19:11:49 +0800
Tag:    v2.1.2

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

commit d8f2500f46b12364abe15e8615bb9512e44aa0f0
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Sep 2011 16:19:47 +0800
Tag:    v2.1.2

Merge branch MDL-29186-m21 of git://github.com/samhemelryk/moodle     - resolved conflicts, minor whitespace and fixed quote.     - note: textlib_get_instance() is already deprecated

commit 6519a7769d8d3035fbac8af4056853879c6eebcb
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Sep 2011 13:54:43 +0800
Tag:    v2.1.2

Merge branch MDL-29187-m21 of git://github.com/samhemelryk/moodle   - resolved conflict.

commit 995b4d16cdaa9cd97fcacbe5642bec8d4801b8ab
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Sep 2011 13:33:56 +0800
Tag:    v2.1.2

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

commit 717c3395be9a21b60522f6e8aa6755365a6adbfd
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Sep 2011 11:45:51 +0800
Tag:    v2.1.2

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

commit 26cfc105847dbe7ed66ff9abae9bc1804a437a76
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 05 Sep 2011 13:18:52 +0800
Tag:    v2.1.2

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

commit 5f856fdfe91b5b99813a2283967bce4fc4907efc
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 05 Sep 2011 12:52:15 +0800
Tag:    v2.1.2

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

commit 97dd4ec53964bc9295b05b920e706dcaf5102787
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 30 Aug 2011 11:19:57 +0800
Tag:    v2.1.2

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

commit 7816f5acb01f68dd52d79a8fcc01b0584ac2bdfc
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 29 Aug 2011 12:01:41 +0800
Tag:    v2.1.2

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

commit 1b502dff19f84c157bad4553d8fb68fd520cbaf2
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 24 Aug 2011 02:59:56 +0800
Tag:    v2.1.2

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

commit e9f8af2a1b56f9126fcf84576ee05527ddb6f377
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 24 Aug 2011 02:28:21 +0800
Tag:    v2.1.2

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

commit 8145290d431fd90f8feaa701c367a8281cac613c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 23 Aug 2011 14:55:11 +0800
Tag:    v2.1.2

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

commit 8db14e344b1d56f379a202ec74628c29eb8e0161
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 23 Aug 2011 01:49:51 +0800
Tag:    v2.1.2

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