Git merges in Moodle 2.2.x by Aparup Banerjee
commit fbef42576badbed4d436f85ff79d69485221db62
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 27 Nov 2012 14:57:31 +0800
Tag: v2.2.7
Merge branch 'MDL-36841_m22' of git://github.com/markn86/moodle into MOODLE_22_STABLE
commit fee4404abaebae45b6b15fac81028e13030caed3
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 27 Nov 2012 12:20:39 +0800
Tag: v2.2.7
Merge branch 'wip-mdl-36767-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE
commit 385cddf6347fef6d52a70428ec2ec25aeaa3fd72
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 27 Nov 2012 11:53:20 +0800
Tag: v2.2.7
Merge branch 'MDL-36305-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE
commit e4cdd9f2cbe672ffdee221d1d0df011bd3eb8d60
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 14 Nov 2012 09:14:02 +0800
Tag: v2.2.7
Merge branch 'wip_22_mdl-25736_tinymce_spellchecker_frech_issues' of https://github.com/iarenaza/moodle into MOODLE_22_STABLE
commit c978929e36cdad0571af33bc7da5177d44f546a6
Author: Aparup Banerjee <aparup@moodle.com>
Date: Thu, 08 Nov 2012 13:32:45 +0800
Tag: v2.2.6
Merge branch 'MDL-27824_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE
commit a70978a2bd639bfe8b61cf4f1a688954fc41c7b1
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 31 Oct 2012 10:05:47 +0800
Tag: v2.2.6
Merge branch 'MDL-31708-moodle22' of git://github.com/StudiUM/moodle into MOODLE_22_STABLE
commit b06c8fdd9cc3b9b925f7aaff1b976be036bb4852
Author: Aparup Banerjee <aparup@moodle.com>
Date: Thu, 18 Oct 2012 19:21:53 +0800
Tag: v2.2.6
Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE
commit 656216af375f4110dd9793ec09a791d371d499db
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 17 Oct 2012 10:40:22 +0800
Tag: v2.2.6
Merge branch 'MDL-28965-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE
commit 55c4569bda9b7fda340d62a572b8255874a8084a
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 15 Oct 2012 15:54:05 +0800
Tag: v2.2.6
Merge branch 'MDL-31010-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE
commit cc6b32b227a7a8b255b88a0a17984bbce4e2af0f
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 10 Oct 2012 10:32:24 +0800
Tag: v2.2.6
Merge branch 'w41_MDL-35839_m22_enroldeletecleanup' of git://github.com/skodak/moodle into MOODLE_22_STABLE
commit 9ed6d76f1251cf5a8a8dccf785329c1637726de6
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 09 Oct 2012 14:12:09 +0800
Tag: v2.2.6
Merge branch 'WIP-MDL-35724-M22_quiz' of git://github.com/nadavkav/moodle into MOODLE_22_STABLE
commit c5833d278cd11ee93be68cd4184fa1c5331f72bf
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 09 Oct 2012 11:54:11 +0800
Tag: v2.2.6
Merge branch 'MDL-35776_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commit d60c0e9650e6059a96c470cd01f40d2f51a0e587
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 08 Oct 2012 17:16:43 +0800
Tag: v2.2.6
Merge branch 'WIP-MDL-35723-M22_quiz' of git://github.com/nadavkav/moodle into MOODLE_22_STABLE
commit 6d4386a6dbba2d14e08d0ab9bd4496120a119664
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 08 Oct 2012 15:30:46 +0800
Tag: v2.2.6
Merge branch 'wip-MDL-34448-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE
commit 057d68fc2ec51debb3db1649e9d692ed0cdf93bd
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 10 Sep 2012 14:39:20 +0800
Tag: v2.2.6
Merge branch 'MDL-35264_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE
commit 1aac11d74dd36406f5601846adc6959381cf55bd
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 10 Sep 2012 14:32:06 +0800
Tag: v2.2.6
Merge branch 'MDL-27398_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE
commit b216fc392f5ee78948fbd1d334863bc99a33c689
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 10 Sep 2012 13:43:00 +0800
Tag: v2.2.6
Merge branch 'MDL-34068_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE
commit 7a5d23ea32ae981d3d3f1b54caf796b479643472
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 04 Sep 2012 17:33:28 +0800
Tag: v2.2.5
Merge branch 'wip-mdl-34537-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE
commit dc5736f40261c3d1101a0889e5d88dde967501dc
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 03 Sep 2012 19:24:14 +0800
Tag: v2.2.5
Merge branch 'MDL-35151_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE
commit 6915eff9b136c4be26017d94e2ae54c5f1fd4ff7
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 03 Sep 2012 17:39:13 +0800
Tag: v2.2.5
Merge branch 'MDL-35180_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE
commit 12f57ec9c3942dd8d0addc64340555699b17c8f7
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 29 Aug 2012 16:57:20 +0800
Tag: v2.2.5
Merge branch 'wip-mdl-31623-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE
commit 2335d65949967e077c33d1e6be54650d1f5debee
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 29 Aug 2012 15:34:06 +0800
Tag: v2.2.5
Merge branch 'MDL-31959_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE
commit 32b8a7bcf0065252ce695e088f27dacb776c9071
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 29 Aug 2012 14:45:44 +0800
Tag: v2.2.5
Merge branch 'wip-mdl-34040-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE
commit 6a4d3ec2904b51b07c52873073040e3fb61123e2
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 29 Aug 2012 13:27:23 +0800
Tag: v2.2.5
Merge branch 'MDL-34952_22' of git://github.com/grabs/moodle into MOODLE_22_STABLE
commit 56d47558ff3c0b43cdddfba498c773a0d4ccc039
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 28 Aug 2012 17:04:48 +0800
Tag: v2.2.5
Merge branch 'MDL-31837_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commit 0639b9ca1a6fe2e56d7deb407fdcb42432083676
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 28 Aug 2012 16:55:14 +0800
Tag: v2.2.5
Merge branch 'MDL-32464_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commit ad24b3a3206be19e3693b2ce1607fbcacc873fad
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 27 Aug 2012 17:26:53 +0800
Tag: v2.2.5
Merge branch 'MDL-31633-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE
commit f76fe808747abc2862f28b4dff07ffb8706f70d6
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 27 Aug 2012 13:48:03 +0800
Tag: v2.2.5
Merge branch 'MDL-34996_22' of git://github.com/grabs/moodle into MOODLE_22_STABLE
commit 408dfe97b803f18a914b6b758eb9e1aac3efdfac
Author: Aparup Banerjee <aparup@moodle.com>
Date: Thu, 16 Aug 2012 11:51:54 +0800
Tag: v2.2.5
Merge branch 'MDL-34565_accessibility_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE
commit e4744c58968ca2fd5c4a86f696a34b105e8fbe2a
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 14 Aug 2012 15:30:16 +0800
Tag: v2.2.5
Merge branch 'wip-MDL-34748-MOODLE_22_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_22_STABLE
commit eed4c2339cce17d98ac4b00b3275be7a53e28f2e
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 14 Aug 2012 14:34:53 +0800
Tag: v2.2.5
Merge branch 'MDL-34563_accessibility_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE
commit 97da1cf0ec932f49b035e6c3fb0b39317745d4d8
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 14 Aug 2012 13:53:43 +0800
Tag: v2.2.5
Merge branch 'MDL-34565_accessibility_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE
commit 3407c2ffe08d7a163af6d8eb8cdf08f8b2847833
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 07 Aug 2012 15:08:04 +0800
Tag: v2.2.5
Merge branch 'MDL-34566_accessibility_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE
commit 8bcbce157686158f1e9be934eb72db9bc68a0ff9
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 07 Aug 2012 14:58:05 +0800
Tag: v2.2.5
Merge branch 'MDL-34564_accessibility_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE
commit 24bcc1e5256472a2bb14b02281556238f1a8c5ed
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 07 Aug 2012 14:45:55 +0800
Tag: v2.2.5
Merge branch 'MDL-34560_accessibility_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE
commit 7733795102d40ecd6337ba5aa9b3d5ab137e5c6c
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 07 Aug 2012 14:37:24 +0800
Tag: v2.2.5
Merge branch 'MDL-34559_accessibility_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE
commit 0c9a3490bb3eeec6c4f6e280beac0b069be6d860
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 07 Aug 2012 13:58:45 +0800
Tag: v2.2.5
Merge branch 'MDL-28531-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE
commit dd9f138e1d67068fe2d58b7984be7925b4a143fb
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 07 Aug 2012 10:42:37 +0800
Tag: v2.2.5
Merge branch 'MDL-34715-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE
commit 07b64939e8636776aa5bdf2db0991cb4aae6164a
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 07 Aug 2012 10:01:04 +0800
Tag: v2.2.5
Merge branch 'MDL-22663-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE
commit e8b2b43aff7037a896f555777e52a2d13796132f
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 07 Aug 2012 09:24:05 +0800
Tag: v2.2.5
Merge branch 'MDL-33022-22' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE
commit f2a044dc6b113a7208bd2c6979246f8d4a6537c6
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 06 Aug 2012 16:44:17 +0800
Tag: v2.2.5
Merge branch 'MDL-31599-22' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE
commit a1ee3b38a206fdf57a2b0a918c61cd5286bce6b0
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 06 Aug 2012 16:38:20 +0800
Tag: v2.2.5
Merge branch 'MDL-34716-22' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE
commit 906f0ddbcac4c6040ab99105844ddd0d48faa9cb
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 31 Jul 2012 13:20:52 +0800
Tag: v2.2.5
Merge branch 'MDL-34650_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE
commit d61be4030fefd463c833c9c2bf8c0220cb6f15ea
Author: Aparup Banerjee <aparup@moodle.com>
Date: Thu, 26 Jul 2012 14:00:57 +0800
Tag: v2.2.5
Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE
commit aa95731b73dc19cdeb01bd70cb5d115b568e6538
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 24 Jul 2012 16:40:19 +0800
Tag: v2.2.5
Merge branch 'MDL-26969_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE
commit ccbdbc7f67b02994cefe4af5c34a8d294afc144c
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 24 Jul 2012 11:03:15 +0800
Tag: v2.2.5
Merge branch 'wip-mdl-33159-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE
commit aeb48cca52ad20086bc53cde13d37c2236f3649f
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 23 Jul 2012 10:22:09 +0800
Tag: v2.2.5
Merge branch 'MDL-32665_chat_popup_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE
commit f4eaf5c7f067915936bb7458aa24df266f7115b1
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 20 Jun 2012 17:18:30 +0800
Tag: v2.2.4
Merge branch 'wip-MDL-33811-m22' of git://github.com/samhemelryk/moodle into MOODLE_22_STABLE
commit 89c3d84eda723c78fa7c3636816e7fe5f4f4d70c
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 12 Jun 2012 11:27:48 +0800
Tag: v2.2.4
Merge branch 'm22_MDL-33515' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE
commit c93ff53c8272ffe2121609c7f5f1a2902aee6f8a
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 11 Jun 2012 13:55:54 +0800
Tag: v2.2.4
Merge branch 'MDL-33548_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commit 092e389f4fe5c8b709004a490f5fc1eb8073908c
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 05 Jun 2012 15:15:44 +0800
Tag: v2.2.4
Merge branch 'wip-mdl-33455-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE
commit c7fc98256a114f2c44dc6f74456009831670478a
Author: Aparup Banerjee <aparup@moodle.com>
Date: Thu, 31 May 2012 14:15:44 +0800
Tag: v2.2.4
Merge branch 'MDL-33140_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commit 4fb3cc589471044297fae3b7c7d23a1923694943
Author: Aparup Banerjee <aparup@moodle.com>
Date: Thu, 24 May 2012 15:42:22 +0800
Tag: v2.2.4
Merge branch 'm22_MDL-33318' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE
commit 5a6042c9be015fa5e722ee42150165b0c2974ccc
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 16 May 2012 16:05:42 +0800
Tag: v2.2.4
Merge branch 'MDL-32633_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commit 479f14a07be473e1179ae7c6255b9d0117426f26
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 15 May 2012 16:10:33 +0800
Tag: v2.2.4
Merge branch 'MDL-32861-22' of https://github.com/mackensen/moodle into MOODLE_22_STABLE
commit 1eab78b30e1e932a866fa340be6ce4570b97e27f
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 15 May 2012 11:08:21 +0800
Tag: v2.2.4
Merge branch 'MDL-25695-22' of https://github.com/mackensen/moodle into MOODLE_22_STABLE
commit 58d053313f574dc5afb110b97da3b89bf338c3fe
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 02 May 2012 13:55:50 +0800
Tag: v2.2.3
Merge branch 'MDL-28657-22' of https://github.com/mackensen/moodle into MOODLE_22_STABLE
commit 42bcf023b4bdf4ede98b609ac2793d9953b478e1
Author: Aparup Banerjee <aparup@moodle.com>
Date: Thu, 05 Apr 2012 16:19:49 +0800
Tag: v2.2.3
Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE
commit c461a6a0a76a8b6867b9b6e3dce936f0eb5dee48
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 04 Apr 2012 13:41:00 +0800
Tag: v2.2.3
Merge branch 'wip-MDL-31631-m22' of git://github.com/samhemelryk/moodle into MOODLE_22_STABLE
commit d0f6d6172a1f087d7d987421f25c4828d01dbaad
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 03 Apr 2012 17:00:51 +0800
Tag: v2.2.3
Merge branch 'wip-MDL-30784-stable22' of git://github.com/phalacee/moodle into MOODLE_22_STABLE
commit 3ba909de87452a931816f258e3129c0d2a635cda
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 03 Apr 2012 16:32:06 +0800
Tag: v2.2.3
Merge branch 'wip-MDL-31789-MOODLE_22_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_22_STABLE
commit 0161e20b651417312a68c4449dbcfe7a7e3e7fd4
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 27 Mar 2012 10:10:19 +0800
Tag: v2.2.3
Merge branch 'wip-MDL-32106-MOODLE_22_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_22_STABLE
commit 6a680dd4aa702106adbca9afc676a0df0716b6f3
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 20 Mar 2012 16:12:21 +0800
Tag: v2.2.3
Merge branch 'MDL-29848-22' of https://github.com/mackensen/moodle into MOODLE_22_STABLE
commit fbc708dc4d6f754287f798bf662fef0f18409861
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 20 Mar 2012 10:10:11 +0800
Tag: v2.2.3
Merge branch 'wip-MDL-31528-m22' of git://github.com/samhemelryk/moodle into MOODLE_22_STABLE
commit c04109fcb1c32e441cc22a18e869c31be16df4ca
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 13 Mar 2012 15:28:12 +0800
Tag: v2.2.3
Merge branch 'wip-mdl-27862-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE
commit 298dd4ca5d43c6bdbdb2b8e1eec6d427c422d50e
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 13 Mar 2012 11:51:54 +0800
Tag: v2.2.3
Merge branch 'wip-mdl-30817-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE
commit 08ba77f32e92ba159dd1aaf1e43c7ff47c3e6077
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 13 Mar 2012 11:32:29 +0800
Tag: v2.2.3
Merge branch 'MDL-30867_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE
commit 2e0d0590daffde2fe19b6fbea4d1f778d8b5fc57
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 28 Feb 2012 16:41:52 +0800
Tag: v2.2.2
Merge branch 'MDL-14837_show-time-on-no-duration-events_22_STABLE' of https://github.com/ncsu-delta/moodle into MOODLE_22_STABLE
commit 91470a354e67db6ec63ac244f615b273aa72db4a
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 28 Feb 2012 16:23:21 +0800
Tag: v2.2.2
Merge branch '22_MDL-31419_fix_auth_typo' of git://github.com/gerrywastaken/moodle into MOODLE_22_STABLE
commit 01c7382881a65f7891502c3bddd9b4342ee3264a
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 28 Feb 2012 15:37:36 +0800
Tag: v2.2.2
Merge branch 'MDL-30878-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE
commit 9a7310e80b2a2dde98804e79322cbbd7ae9a8fd3
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 28 Feb 2012 14:42:08 +0800
Tag: v2.2.2
Merge branch 'MDL-28386-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE
commit 415dd485a579628a6ffc79c29041e43794f39bea
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 28 Feb 2012 14:15:37 +0800
Tag: v2.2.2
Merge branch 'MDL-31335_mtrace_email_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE
commit 844d4f0ce0ad68782540e8f3b2045714a9143ae6
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 28 Feb 2012 13:48:40 +0800
Tag: v2.2.2
Merge branch 'wip-mdl-22896-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE
commit fe4e706f3a5c17ef111e88ee9866eb8a13e3f32f
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 28 Feb 2012 12:05:20 +0800
Tag: v2.2.2
Merge branch 'MDL-31399_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE
commit 7fda50ccee4da6523340f30ff8343d660a637009
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 14 Feb 2012 15:39:04 +0800
Tag: v2.2.2
Merge branch 'wip-mdl-28101-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE
commit bef142834536a6a3be7e5fcd96ad4fc83fbf10f9
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 14 Feb 2012 11:43:03 +0800
Tag: v2.2.2
Merge branch 'MDL-29471-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE
commit 3509aa02750c21a8bd643fce83150bc909a97e97
Author: Aparup Banerjee <aparup@moodle.com>
Date: Thu, 09 Feb 2012 09:45:08 +0800
Tag: v2.2.2
Merge branch 'wip-MDL-31417-MOODLE_22_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_22_STABLE
commit e5f77fdae4c64ba4e8bf6026980fe37261696001
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 08 Feb 2012 11:27:39 +0800
Tag: v2.2.2
Merge branch 'MDL-31407_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commit 4bd74c8ddce16d8c87af3410f4f51ffc071431ab
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 08 Feb 2012 10:12:26 +0800
Tag: v2.2.2
Merge branch 'm22_MDL-31461' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE
commit 822790437e29fb4ac15ac8cf4b6c622c4a0a8a91
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 08 Feb 2012 09:59:04 +0800
Tag: v2.2.2
Merge branch 'MDL-31482-m22' of git://github.com/sammarshallou/moodle into MOODLE_22_STABLE
commit 3e299e464d123143993fcc5d6376c159e75540ab
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 07 Feb 2012 15:12:26 +0800
Tag: v2.2.2
Merge branch 'MDL-31469_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commit 6432e1b4e199d503931f707643c2339d66547a02
Author: Aparup Banerjee <aparup@moodle.com>
Date: Thu, 02 Feb 2012 11:13:22 +0800
Tag: v2.2.2
Merge branch 'm22_MDL-31360' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE
commit cfbde86579b805c72a071656ae9baa3ca2e932ef
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 31 Jan 2012 16:51:08 +0800
Tag: v2.2.2
Merge branch 'MDL-30828_feedback_sort_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE
commit 5684c6ab9943b26c8673602dc7f3f42854a3878a
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 31 Jan 2012 16:43:46 +0800
Tag: v2.2.2
Merge branch 'MDL-30707_forum_log_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE
commit a5f1f8c0e205180d54dafa22fed98c7f8d533ab3
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 31 Jan 2012 14:36:15 +0800
Tag: v2.2.2
Merge branch 'MDL-29097_mod_update_create_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE
commit 3d257cbf0890aafc0c91dc33df82d9b4ae99677f
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 31 Jan 2012 11:52:24 +0800
Tag: v2.2.2
Merge branch 'MDL-31426_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE
commit 611d3bd71d6f15679c948602cd1a79d2e01352d6
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 31 Jan 2012 11:15:55 +0800
Tag: v2.2.2
Merge branch 'MDL-31428_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE
commit db780684436bb2a51bc3826c431e4a3b94c1d3af
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 30 Jan 2012 16:26:47 +0800
Tag: v2.2.2
Merge branch 'MDL-26260_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commit c8a11c7410c03c277683c014e9db880a5bb0517c
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 30 Jan 2012 14:25:35 +0800
Tag: v2.2.2
Merge branch 'MDL-31392_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commit c327996e6b45fa5ba03ced7bcf8f2dbc854ff695
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 24 Jan 2012 23:01:26 +0800
Tag: v2.2.2
Merge branch 'wip-MDL-31224-m22' of git://github.com/samhemelryk/moodle into MOODLE_22_STABLE
commit b7c8fb66104b1b3525fbc578e923c2f5c3657dfa
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 24 Jan 2012 07:12:31 +0800
Tag: v2.2.2
Merge branch 'wip-MDL-28352-MOODLE_22_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_22_STABLE
commit 787c2eefd3e13f75d2282c055fcf528d49e6eec4
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 24 Jan 2012 06:58:33 +0800
Tag: v2.2.2
Merge branch 'w04_MDL-31184_m22_glosreset' of git://github.com/skodak/moodle into MOODLE_22_STABLE
commit 1a3b5c6cfc58d74436366ea76f995cbc4c9bf6f2
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 16 Jan 2012 15:29:30 +0800
Tag: v2.2.2
Merge branch 'MDL-31143_22' of https://github.com/timhunt/moodle into MOODLE_22_STABLE
commit 0a52c0d63d2f8fba0aa6810fdf201699c5356151
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 16 Jan 2012 14:52:48 +0800
Tag: v2.2.2
Merge branch 'w03_MDL-31166_m22_clipath' of https://github.com/skodak/moodle into MOODLE_22_STABLE
commit 7b3dae90968fc1d24635109ab9acc561cfea34ee
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 16 Jan 2012 14:48:16 +0800
Tag: v2.2.2
Merge branch 'w03_MDL-21992_m22_customscripts' of https://github.com/skodak/moodle into MOODLE_22_STABLE
commit 94828bec3588291eee96d6b9c69e1da807161382
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 16 Jan 2012 11:39:43 +0800
Tag: v2.2.2
Merge branch 'wip-MDL-31072-MOODLE_22_STABLE' of github.com:marinaglancy/moodle into MOODLE_22_STABLE
commit 54afb1ca01f9c6c9b0ca42cefccef69e439ca4bf
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 09 Jan 2012 12:20:34 +0800
Tag: v2.2.2
Merge branch 'w02_MDL-30718_m22_usertimedb' of git://github.com/skodak/moodle into MOODLE_22_STABLE
commit 8ef685cf4ce53321dd3454a2393285c54b5deb85
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 03 Jan 2012 12:31:22 +0800
Tag: v2.2.1
Merge branch 'wip-mdl-29844-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE
commit 8fe13ecf1a2d6721cc2cd38cb7e522ec820bacb5
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 21 Dec 2011 14:16:55 +0800
Tag: v2.2.1
Merge branch 'wip-MDL-30541-stable22' of git://github.com/phalacee/moodle into MOODLE_22_STABLE
commit dbfa519ad9e4d33ac3a4cd506d606d56a2f0bbff
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 21 Dec 2011 11:28:33 +0800
Tag: v2.2.1
MDL-28126 webservice : resolved integration conflicts
commit 40b67fca0a31ff92c0a4ec541cb7a3e5a8d62455
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 20 Dec 2011 19:15:20 +0800
Tag: v2.2.1
Merge branch 'MDL-25561_user_report_name_clickable_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE
commit 18952a18fd6fdbcd9459c27d10eb18852615f223
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 20 Dec 2011 11:11:02 +0800
Tag: v2.2.1
Merge branch 'MDL-30569-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE
commit 85daa5926c88b057fdb53f0e09e83dace5f4e689
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 19 Dec 2011 11:53:32 +0800
Tag: v2.2.1
Merge branch 'w51_MDL-30735_m22_cron' of git://github.com/skodak/moodle into MOODLE_22_STABLE
commit a23463acec975b05c3f1acc9ea3cd3fbbcb007dc
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 13 Dec 2011 17:05:07 +0800
Tag: v2.2.1
Merge branch 'MDL-29772-22' of git://github.com/bostelm/moodle into MOODLE_22_STABLE
commit 9dfd9a124dbcad557190d631fcf6a64cfd9fbd76
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 13 Dec 2011 14:36:02 +0800
Tag: v2.2.1
Merge branch 'MDL-30472-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE
commit a3bb5afdd06ffb3f03e240dd68273dc75b7856ff
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 13 Dec 2011 14:01:57 +0800
Tag: v2.2.1
Merge branch 'MDL-30562_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commit 3a353b12baa0a02e743b92fd79f41108e5b3515a
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 13 Dec 2011 13:21:05 +0800
Tag: v2.2.1
Merge branch 'MDL-30655-m22' of git://github.com/sammarshallou/moodle into MOODLE_22_STABLE
commit b750cfde8145c23b63d062f5fcdcc0dde1ff89af
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 12 Dec 2011 15:05:37 +0800
Tag: v2.2.1
Merge branch 'w51_MDL-30613_m22_FULLME' of git://github.com/skodak/moodle into MOODLE_22_STABLE
commit 0f69a9eaaf196177c4b1c9fa8028b27a91049983
Author: Aparup Banerjee <aparup@moodle.com>
Date: Thu, 08 Dec 2011 16:19:02 +0800
Tag: v2.2.1
Merge branch 'wip-MDL-30336-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE
commit cdbd44f00eb4648f1320807d4df725da3e8e58df
Author: Aparup Banerjee <aparup@moodle.com>
Date: Thu, 08 Dec 2011 15:54:55 +0800
Tag: v2.2.1
Merge branch 'wip-mdl-30560-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE
commit 30e1b798893f9408ecf304ddbe23ea2fd5eff1fd
Author: Aparup Banerjee <aparup@moodle.com>
Date: Thu, 08 Dec 2011 14:04:46 +0800
Tag: v2.2.1
Merge branch 'MDL-27432_gd_error_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE
commit d30043c8523e2f097b664e32d911077b3b44fa66
Author: Aparup Banerjee <aparup@moodle.com>
Date: Thu, 08 Dec 2011 13:48:27 +0800
Tag: v2.2.1
Merge branch 'MDL-28710_rating_classes_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE
commit add75e9682f2a74f1abb4c6832c2954c73b8fb9b
Author: Aparup Banerjee <aparup@moodle.com>
Date: Thu, 08 Dec 2011 13:39:49 +0800
Tag: v2.2.1
Merge branch 'MDL-30607_override_email_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE
commit 9be14d29e43513b0a5afd72d634776f4dcd9532b
Author: Aparup Banerjee <aparup@moodle.com>
Date: Thu, 01 Dec 2011 11:54:25 +0800
Tag: v2.2.0-rc1
Merge branch 'wip-MDL-30386-master' of git://github.com/phalacee/moodle
commit 0fa557d5fd400250b56d8fe314f8771ca58f7fc4
Author: Aparup Banerjee <aparup@moodle.com>
Date: Thu, 01 Dec 2011 11:24:47 +0800
Tag: v2.2.0-rc1
Merge branch 'MDL-30260_disable_messages' of git://github.com/andyjdavis/moodle
commit 15cca3e470ad15c58580980f42202cc55ad52e86
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 30 Nov 2011 17:47:18 +0800
Tag: v2.2.0-rc1
Merge branch 'MDL-30494_tokenize_test' of git://github.com/andyjdavis/moodle
commit e95a0cefda93f05967c11d8217e403450e179be7
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 30 Nov 2011 17:39:23 +0800
Tag: v2.2.0-rc1
Merge branch 'w49_MDL-30517_m22_blockdelete' of git://github.com/skodak/moodle
commit 20ab954b3c599a2d5e1137495d619b2e3fdca95d
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 30 Nov 2011 15:36:14 +0800
Tag: v2.2.0-rc1
Merge branch 'MDL-30202' of git://github.com/rwijaya/moodle
commit d423462e1cdfd5be9e586b9e93510aa4af6d8ce9
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 30 Nov 2011 15:01:25 +0800
Tag: v2.2.0-rc1
Merge branch 'wip-MDL-27334-master' of git://github.com/abgreeve/moodle
commit 96b3002aae77c0252d855c89bca69ca36d68d30b
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 30 Nov 2011 14:37:59 +0800
Tag: v2.2.0-rc1
Merge branch 'wip-MDL-29469-master' of git://github.com/phalacee/moodle
commit 2069c52e20fa35aec17fd27b4c5842b9cc3090e2
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 30 Nov 2011 14:04:14 +0800
Tag: v2.2.0-rc1
Merge branch 'MDL-30395' of git://github.com/mouneyrac/moodle
commit 1b39425dae69077b85b36b9b6b5d2fc0d38d790e
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 29 Nov 2011 16:38:02 +0800
Tag: v2.2.0-rc1
Merge branch 'wip-MDL-28646' of git://github.com/mouneyrac/moodle
commit 67411c839952c109dc6551e52b3a36b29624f7cc
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 29 Nov 2011 11:27:53 +0800
Tag: v2.2.0-rc1
Merge branch 'MDL-30368' of git://github.com/rwijaya/moodle
commit 66b97716c54350c3d7be04b96df4d7b7806f5522
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 28 Nov 2011 17:02:26 +0800
Tag: v2.2.0-rc1
Merge branch 'wip-MDL-30214-master' of github.com:marinaglancy/moodle
commit 3625e9049f1cb1f2679044b4a9aa7b3672f70377
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 28 Nov 2011 15:21:34 +0800
Tag: v2.2.0-rc1
Merge branch 'MDL-30379' of git://github.com/rwijaya/moodle
commit 00347b3c3c437ca31b2c78216598d31de1df6ec0
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 28 Nov 2011 14:33:57 +0800
Tag: v2.2.0-rc1
Merge branch 'MDL-30243' of git://github.com/lazydaisy/moodle
commit 86b3dd264e792f2c5fe693aea25d7a751d9a8017
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 28 Nov 2011 11:43:03 +0800
Tag: v2.2.0-rc1
Merge branch 'MDL-30460-master' of git://github.com/ankitagarwal/moodle
commit 98377ed578b003829fd7a1b5ff7d480ed1de569b
Author: Aparup Banerjee <aparup@moodle.com>
Date: Fri, 25 Nov 2011 11:59:10 +0800
Tag: v2.2.0-rc1
Merge branch 'MDL-30428-master-1' of git://git.luns.net.uk/moodle
commit c47b8c7d0c074fe6a841b9bc62527fe54956fed8
Author: Aparup Banerjee <aparup@moodle.com>
Date: Thu, 24 Nov 2011 16:14:37 +0800
Tag: v2.2.0-rc1
Merge branch 'MDL-30288_override_checkbox' of git://github.com/andyjdavis/moodle
commit 3ca3098f3103fdb059b741892040a35fad479630
Author: Aparup Banerjee <aparup@moodle.com>
Date: Thu, 24 Nov 2011 14:39:53 +0800
Tag: v2.2.0-rc1
Merge branch 'MDL-29226' of git://github.com/lazydaisy/moodle
commit c32e3a0a0afa3a25d5a023ae6bfad8b447dc0703
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 23 Nov 2011 14:34:34 +0800
Tag: v2.2.0-rc1
Merge branch 'MDL-30026_sqlsrv' of git://github.com/stronk7/moodle
commit d7de1c8a6230ffacec6e40be808bf4630a55a122
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 23 Nov 2011 13:47:52 +0800
Tag: v2.2.0-rc1
Merge branch 'MDL-29995' of git://github.com/stronk7/moodle
commit 4cff8cb5507bf3c9f806a149b4e4bb5f1fb7a598
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 23 Nov 2011 12:36:35 +0800
Tag: v2.2.0-rc1
Merge branch 'MDL-28562_wip' of https://github.com/jamiepratt/moodle
commit a9c56ad2dfb12b8f1ec579f32994ef32ded13588
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 23 Nov 2011 12:06:58 +0800
Tag: v2.2.0-rc1
Merge branch 'master_MDL-29290' of git://github.com/danmarsden/moodle
commit 5cde86faa931d88fa7ddd64b2b79f52b72ed87ab
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 23 Nov 2011 11:41:58 +0800
Tag: v2.2.0-rc1
Merge branch 'MDL-30335' of git://github.com/timhunt/moodle
commit d2b5a2caf5aa65ffc2a99034250e664a0d5786bc
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 23 Nov 2011 11:12:03 +0800
Tag: v2.2.0-rc1
Merge branch 'wip-MDL-20627-master' of git://github.com/abgreeve/moodle
commit e0e2db92a3a228d237dcc222f67f641351b39621
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 22 Nov 2011 17:16:27 +0800
Tag: v2.2.0-rc1
Merge branch 'MDL-30397' of git://github.com/timhunt/moodle
commit 65fbaea13dd4fe3b34c68472c1bf2d9f64118951
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 22 Nov 2011 16:26:29 +0800
Tag: v2.2.0-rc1
Merge branch 'MDL-30185' of git://github.com/colchambers/moodle
commit 525e45795a4483f330690cba8bdee6869cdb2759
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 22 Nov 2011 16:08:57 +0800
Tag: v2.2.0-rc1
Merge branch 'wip-mdl-29396' of git://github.com/rajeshtaneja/moodle
commit 46fc365c7710f832e9959ac9a4631a20b072c4f7
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 22 Nov 2011 15:28:17 +0800
Tag: v2.2.0-rc1
Merge branch 'MDL-27735' of git://github.com/rwijaya/moodle
commit 6aabd59e69e8843b3531c0ba9d62cbfbbb17d844
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 22 Nov 2011 13:48:24 +0800
Tag: v2.2.0-rc1
Merge branch 'MDL-27703_user_report_sql' of git://github.com/andyjdavis/moodle
commit 3a9e6be55ad105ca81da635cd9a623c11e7e5994
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 22 Nov 2011 11:33:55 +0800
Tag: v2.2.0-rc1
Merge branch 'w46_MDL-30349_m22_filestatcaching' of git://github.com/skodak/moodle
commit 85227804b4b6e8b7a54a069083728a0bc86f4f77
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 22 Nov 2011 01:15:26 +0800
Tag: v2.2.0-rc1
Merge branch 'MDL-29814_blank_emails2' of git://github.com/andyjdavis/moodle
commit 3a59d04c659a3157952d9e7adcc7f979f883f69f
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 21 Nov 2011 14:47:23 +0800
Tag: v2.2.0-rc1
MDL-30268 Web service : resolved version number conflict
commit 9dc97097b1429a7e068b713d52ac1283a8cbd41e
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 21 Nov 2011 13:57:34 +0800
Tag: v2.2.0-rc1
Merge branch 'wip-MDL-30289-master' of git://github.com/abgreeve/moodle
commit 338b9cab8382be7b126b6ec9946aa850f9316690
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 21 Nov 2011 11:28:27 +0800
Tag: v2.2.0-rc1
Merge branch 'w46_MDL-21617_m22_xhack' of git://github.com/skodak/moodle
commit 8adce198e430ddc83503dc2666ed4d3ee356b2dd
Author: Aparup Banerjee <aparup@moodle.com>
Date: Fri, 18 Nov 2011 15:34:18 +0800
Tag: v2.2.0-rc1
Merge branch 'MDL-30279-master' of git://github.com/ankitagarwal/moodle
commit d48dae7507a572ceda79be39fb45de450662c68d
Author: Aparup Banerjee <aparup@moodle.com>
Date: Fri, 11 Nov 2011 11:26:22 +0800
Tag: v2.2.0-beta
Merge branch 'wip-MDL-26712-master' of git://github.com/phalacee/moodle
commit b965ee236c2eadce27e40afbe85bad43ca9899f5
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 09 Nov 2011 17:55:04 +0800
Tag: v2.2.0-beta
Merge branch 'MDL-29620-workshop-sequence' of git://github.com/mudrd8mz/moodle
commit 024f0f7374b8774083b26ed5243422ad035dc21d
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 09 Nov 2011 13:40:24 +0800
Tag: v2.2.0-beta
Merge branch 'MDL-29977-mnet-masquerade' of git://github.com/mudrd8mz/moodle
commit 92f6c2eb7f51cde8c48cd06ba1bde7f394978957
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 09 Nov 2011 12:19:20 +0800
Tag: v2.2.0-beta
Merge branch 'MDL-30021' of git://github.com/timhunt/moodle
commit 097ba12ba03c80c1d430c7a7993a76a2235e034a
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 09 Nov 2011 11:29:45 +0800
Tag: v2.2.0-beta
Merge branch 'MDL-29058' of git://github.com/timhunt/moodle
commit 5b653c75dde8362a55fd25cb4f79ec9a17a2cfbe
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 09 Nov 2011 11:05:32 +0800
Tag: v2.2.0-beta
Merge branch 'wip-MDL-24200-master' of git://github.com/phalacee/moodle
commit 98901d3ea9eb16e6c2e03111e2123979f334d2e1
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 08 Nov 2011 20:34:41 +0800
Tag: v2.2.0-beta
Merge branch 'MDL-29739' of git://github.com/timhunt/moodle
commit 3c905de59d9f6a3a77f75f31271c2b8df02284cc
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 08 Nov 2011 16:48:59 +0800
Tag: v2.2.0-beta
Merge branch 'MDL-29970' of git://github.com/timhunt/moodle
commit 3730e077fc04f96dd64f1c93b95dd7bee05fd5cd
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 08 Nov 2011 15:18:22 +0800
Tag: v2.2.0-beta
Merge branch 'wip-mdl-27521-master' of git://github.com/phalacee/moodle
commit 3a21e47829042f28d72f22dc650b206c16b13815
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 08 Nov 2011 14:50:16 +0800
Tag: v2.2.0-beta
Merge branch 'wip-mdl-27790-modified' of git://github.com/rajeshtaneja/moodle
commit 7e63edc42f6200244e7e45ee84fefa6ac2a9885c
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 08 Nov 2011 11:43:49 +0800
Tag: v2.2.0-beta
Merge branch 'MDL-30135' of git://github.com/timhunt/moodle
commit d4bdd01bd2b6477ff38ee4bf790cff678ad089d5
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 08 Nov 2011 11:37:59 +0800
Tag: v2.2.0-beta
Merge branch 'MDL-30137' of git://github.com/timhunt/moodle
commit 7a3a8fd0c5c04e093064d5919773abc256a1be74
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 08 Nov 2011 11:15:01 +0800
Tag: v2.2.0-beta
Merge branch 'MDL-30154_master_wip' of git://github.com/grabs/moodle
commit ddba89cc2ab6071bd2fd24a2984939b319c9996b
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 01 Nov 2011 15:18:44 +0800
Tag: v2.2.0-beta
Merge branch 'w43_MDL-30005_m22_uri' of git://github.com/skodak/moodle
commit 203683e415e7cedca1944c38555d70e174224425
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 01 Nov 2011 13:23:03 +0800
Tag: v2.2.0-beta
Merge branch 'MDL-29983' of git://github.com/timhunt/moodle
commit d29f4e055dde9e67820d64a36f231117ec7a7f82
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 01 Nov 2011 12:15:40 +0800
Tag: v2.2.0-beta
Merge branch 'w43_MDL-29990_m22_navcontinue' of git://github.com/skodak/moodle
commit b68c0776320712a99fbcd188c614fc4cfa29fb38
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 01 Nov 2011 12:00:57 +0800
Tag: v2.2.0-beta
Merge branch 'MDL-29787' of git://github.com/lazydaisy/moodle
commit d1e82ba966124aefce9f45b053b03e8cf717ff2b
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 31 Oct 2011 17:19:14 +0800
Tag: v2.2.0-beta
Merge branch 'w43_MDL-29922_m22_smarty' of git://github.com/skodak/moodle
commit c84f4700ec3ba6207ead924231c5ca4b918d14d7
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 31 Oct 2011 17:08:32 +0800
Tag: v2.2.0-beta
Merge branch 'w43_MDL-29921_m22_qti2' of git://github.com/skodak/moodle
commit ae44df3c43648d57b2a304b3b5ae9056fe68d1dc
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 31 Oct 2011 16:10:00 +0800
Tag: v2.2.0-beta
Merge branch 'w43_MDL-29972_m22_langreset' of git://github.com/skodak/moodle
commit c2c7d8715d80279ef74c657eb8ee5d1a26ba78b1
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 31 Oct 2011 16:05:12 +0800
Tag: v2.2.0-beta
Merge branch 'w43_MDL-29966_m22_grouploading' of git://github.com/skodak/moodle
commit b6d2f5b266c1393095b0a1bb91dab9de729410ac
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 31 Oct 2011 15:25:55 +0800
Tag: v2.2.0-beta
Merge branch 'w43_MDL-29984_m22_enroltoday' of git://github.com/skodak/moodle
commit 2636126f89747f039264c7ba1392b2ac79d5c408
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 31 Oct 2011 14:13:46 +0800
Tag: v2.2.0-beta
Merge branch 'w43_MDL-30005_m22_uri' of git://github.com/skodak/moodle
commit 046391ea1105a2b7a61ea1522a2b1147c801678a
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 31 Oct 2011 10:23:59 +0800
Tag: v2.2.0-beta
Merge branch 'w43_MDL-29923_m22_removesearch' of git://github.com/skodak/moodle
commit a0b10b271f3627ded63748c132ae4caf4ab8bb6c
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 26 Oct 2011 11:23:09 +0800
Tag: v2.2.0-beta
Merge branch 'MDL-29854_b' of git://github.com/timhunt/moodle
commit 0e03740fc80c8e336f9d6f662fbad82c568f752e
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 24 Oct 2011 17:05:17 +0800
Tag: v2.2.0-beta
Merge branch 'MDL-29542' of git://github.com/rwijaya/moodle
commit 64fcc674f99ba065737ebe00b1eb653ec31a8996
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 24 Oct 2011 16:39:17 +0800
Tag: v2.2.0-beta
Merge branch 'MDL-29828' of git://github.com/timhunt/moodle
commit 9809413bbaaa5bb0d9b52175db64665b6f06e29b
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 24 Oct 2011 15:37:14 +0800
Tag: v2.2.0-beta
Merge branch 'MDL-29527' of git://git.luns.net.uk/moodle
commit 5117a3d789420a8a71a25d85f3f53788990f643a
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 24 Oct 2011 14:21:39 +0800
Tag: v2.2.0-beta
Merge branch 'MDL-29619-master' of git://github.com/ankitagarwal/moodle
commit b077de82f9bf3a40fc66e379339e6e427a10eeeb
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 24 Oct 2011 13:26:28 +0800
Tag: v2.2.0-beta
Merge branch 'MDL-29646-master' of git://github.com/ankitagarwal/moodle
commit c11ccbfd8b650fdfc37b77c8a09e0074d010c4bd
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 24 Oct 2011 11:36:07 +0800
Tag: v2.2.0-beta
Merge branch 'MDL-29818-master' of git://git.luns.net.uk/moodle
commit fc09870e0e86ade039a746cf6c62675b39882c56
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 11 Oct 2011 13:37:34 +0800
Tag: v2.2.0-beta
Merge branch 'wip-MDL-27058-master' of git://github.com/samhemelryk/moodle.git (solved conflict)
commit 44d872b87eb2e9f51e0aef7057bb3795bdeb895c
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 11 Oct 2011 11:19:14 +0800
Tag: v2.2.0-beta
Merge branch 'wip-MDL-27278-master' of git://github.com/samhemelryk/moodle
commit bdfb2b71b7cf3e3bbe6d2aa1c83dde072d360b54
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 11 Oct 2011 09:46:16 +0800
Tag: v2.2.0-beta
Merge branch 'wip-MDL-28549-master' of git://github.com/samhemelryk/moodle
commit e6d80c1d3e39fd05ed3d1118ee34edbd49224d87
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 11 Oct 2011 09:26:30 +0800
Tag: v2.2.0-beta
Merge branch 'wip-MDL-28582-master' of git://github.com/samhemelryk/moodle
commit aabf13c24002d6b60e23d33aab920ffefcf411e3
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 10 Oct 2011 23:14:05 +0800
Tag: v2.2.0-beta
Merge branch 'wip-MDL-29224-master' of git://github.com/samhemelryk/moodle
commit f7175860917b171ff789efa27fe8c12239a42c36
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 10 Oct 2011 22:45:01 +0800
Tag: v2.2.0-beta
Merge branch 'wip-MDL-29672-master' of git://github.com/samhemelryk/moodle
commit 73f5ebea0c787ec7e828dfe7c5a88a5643fa2f52
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 05 Oct 2011 10:54:05 +0800
Tag: v2.2.0-beta
Merge branch 'wip-MDL-28615-master-squashed' of git://github.com/samhemelryk/moodle
commit 2fbc7081864e79a93e251a2d8692ce280ab9671c
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 05 Oct 2011 02:44:28 +0800
Tag: v2.2.0-beta
Merge branch 'MDL-29089_grade_history_missing_columns2' of git://github.com/andyjdavis/moodle.git (resolved version.php conflicts)
commit b735bd19cce4e1bc3d2a3e5f640d25b66f23ee25
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 03 Oct 2011 15:37:50 +0800
Tag: v2.2.0-beta
Merge branch 'MDL-26486' of git://github.com/rwijaya/moodle
commit c1b723e5f107389921936e980bf43deb9b15c5a3
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 03 Oct 2011 13:57:48 +0800
Tag: v2.2.0-beta
Merge branch 'wip-mdl-29244' of git://github.com/rajeshtaneja/moodle
commit 260316ce4812dcc23fcc94a9ecbd667abaa41d6d
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 27 Sep 2011 14:52:00 +0800
Tag: v2.2.0-beta
Merge branch 'MDL-29230' of git://github.com/rwijaya/moodle
commit 59e2fd452394f4bd2a0950d3a827777389139b94
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 27 Sep 2011 13:22:14 +0800
Tag: v2.2.0-beta
Merge branch 'wip-mdl-29244' of git://github.com/rajeshtaneja/moodle
commit df1ed7d435bd522e1c7c5b83b66bf47f69a488d4
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 27 Sep 2011 11:18:17 +0800
Tag: v2.2.0-beta
Merge branch 'MDL-25241_forum_search_ratings' of git://github.com/andyjdavis/moodle
commit b11bf8b841359a96a1220bd53a91572c2a4166e9
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 27 Sep 2011 10:19:06 +0800
Tag: v2.2.0-beta
Merge branch 'w38_MDL-29510_m22_orglang' of git://github.com/skodak/moodle
commit 976624ad5eacf3cc6ab3c1427b3990ec559df01c
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 26 Sep 2011 16:57:01 +0800
Tag: v2.2.0-beta
Merge branch 'MDL-29270-question-grade' of git://github.com/mudrd8mz/moodle
commit 2ba08e4ba2bdb2e74b301c61e55f33c05b475c0d
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 26 Sep 2011 16:00:04 +0800
Tag: v2.2.0-beta
Merge branch 'wip-MDL-29487-master' of git://github.com/samhemelryk/moodle
commit 94f59561ad70871e230fafacdbc6784e99ab910b
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 26 Sep 2011 14:32:52 +0800
Tag: v2.2.0-beta
Merge branch 'MDL-29464' of git://github.com/timhunt/moodle
commit 2a8702c158ae537cf13f165b36684d5ee9d07dd0
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 26 Sep 2011 13:47:20 +0800
Tag: v2.2.0-beta
Merge branch 'MDL-29333_rating_ajax' of git://github.com/andyjdavis/moodle
commit c9f7b5e20ba1956e10a8397c9ac480009947a9bf
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 20 Sep 2011 13:15:52 +0800
Tag: v2.2.0-beta
Merge branch 'MDL-26890-master' of git://github.com/ankitagarwal/moodle
commit 48a7eed5875d1d4bcd6c0aef63bd9ae8ceb482f9
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 20 Sep 2011 10:19:17 +0800
Tag: v2.2.0-beta
Merge branch 'wip-mdl-28726' of git://github.com/rajeshtaneja/moodle
commit aa601cca0a2d9623bbcb0222895f9e667d494270
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 19 Sep 2011 16:02:45 +0800
Tag: v2.2.0-beta
Merge branch 's13_MDL-29036_ws_upload_master' of git://github.com/dongsheng/moodle
commit 9fee890b578240a4e7703638ee64972c27dcd607
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 19 Sep 2011 12:10:23 +0800
Tag: v2.2.0-beta
Merge branch 's13_MDL-28509_youtube_master' of github.com:dongsheng/moodle
commit 631c9c02abbcc893663f3fead8b4817ae0f439c2
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 13 Sep 2011 19:07:22 +0800
Tag: v2.2.0-beta
Merge branch 'MDL-26257' of git://github.com/bostelm/moodle
commit d1e362405e617ea95ae65cccba33e92e4380b777
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 13 Sep 2011 16:06:21 +0800
Tag: v2.2.0-beta
Merge branch MDL-29186-master of git://github.com/samhemelryk/moodle - resolved conflicts, minor whitespace and fixed quote. - note: textlib_get_instance() is already deprecated
commit 7eae2c5ae2d2001fef660d7a5101f356f8472231
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 13 Sep 2011 13:52:31 +0800
Tag: v2.2.0-beta
Merge branch MDL-29187-master of git://github.com/samhemelryk/moodle - resolved conflict.
commit f7dd6bda3113530ca24a11b88261271fab5b435f
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 13 Sep 2011 11:58:21 +0800
Tag: v2.2.0-beta
Merge branch 'wip-MDL-29188-master' of git://github.com/samhemelryk/moodle
commit 9568a4e87b8a518c2bf3f08647a5c4d5aae84e91
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 13 Sep 2011 11:42:18 +0800
Tag: v2.2.0-beta
Merge branch 'master' of git.moodle.org:/git/integration
commit 5433da6064002e1389e94ac06107a167b27ed19c
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 13 Sep 2011 11:38:55 +0800
Tag: v2.2.0-beta
Merge branch MDL-29189-master of git://github.com/samhemelryk/moodle - resolved conflicts.
commit 660a6aae02ec847470496d2fa71364a9d3ddabdf
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 05 Sep 2011 13:29:14 +0800
Tag: v2.2.0-beta
Merge branch 'wip_MDL-27689_Vague_README-LDAP_master' of git://github.com/iarenaza/moodle
commit 57ef9c14cb16812b197544fc1a78328a993fd5ea
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 05 Sep 2011 13:01:23 +0800
Tag: v2.2.0-beta
Merge branch 'wip-MDL-26811-master' of git://github.com/samhemelryk/moodle
commit e2e1cf53dbcd77c9daf10ff6d294c23fb68de469
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 05 Sep 2011 12:10:32 +0800
Tag: v2.2.0-beta
Merge branch 'MDL-29198' of git://github.com/stronk7/moodle
commit d9d76da9339ce2c271f7d6706d4a4a55ca9c3e12
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 30 Aug 2011 11:07:38 +0800
Tag: v2.2.0-beta
Merge branch 'MDL-29005' of git://github.com/mouneyrac/moodle
commit a1b744594c414f2f3807a2b53ed71739bcce2a8d
Author: Aparup Banerjee <aparup@moodle.com>
Date: Mon, 29 Aug 2011 12:10:30 +0800
Tag: v2.2.0-beta
Merge branch 'MDL-29144' of git://github.com/timhunt/moodle
commit 553d343bf2786537d44e0b2aedbaaa5addb3bd23
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 24 Aug 2011 03:03:50 +0800
Tag: v2.2.0-beta
Merge branch 'w33_MDL-28982_m22_sqlfullname' of git://github.com/skodak/moodle
commit 5ad0103d9d3444d8fcdc2238578b6bce961e00d6
Author: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 24 Aug 2011 02:24:08 +0800
Tag: v2.2.0-beta
Merge branch 'MDL-28687' of git://github.com/timhunt/moodle
commit 31d13687c9edffb54f43e103ae812c2da5dac9ef
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 23 Aug 2011 18:17:26 +0800
Tag: v2.2.0-beta
Merge branch 'wip-MDL-25636-master' of git://github.com/samhemelryk/moodle
commit f3d8c8a9a31383c50e0c88fcb968fd336e2a5bb2
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 23 Aug 2011 14:07:08 +0800
Tag: v2.2.0-beta
Merge branch 'MDL-28509_master' of git://github.com/marxjohnson/moodle
commit c6f94ea2fa5c31dd2367880c6ad3f734d9147fcb
Author: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 23 Aug 2011 00:51:28 +0800
Tag: v2.2.0-beta
Merge branch 'wip-mdl-28580' of git://github.com/rajeshtaneja/moodle