Git merges in Moodle x.x.x by Aparup Banerjee

commit ed289a2cdd76a6c143cffbb50815546b1ab6bef6
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 13 Nov 2013 09:51:09 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42711-master' of github.com:nebgor/moodle into MDL-42711-master

commit 95b2934b23521cc738069d428e6c912b71e3e610
Author: Aparup Banerjee <nebgor@gmail.com>
Date:   Wed, 13 Nov 2013 09:48:46 +0800
Tag:    v2.6.0-rc1

Merge pull request #3 from mudrd8mz/MDL-42711-lmnet-clean-theme-backport

commit 883050603cbe1f3d5ada2187c0fac5a32a4e1b23
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 09 Apr 2013 14:31:10 +0800
Tag:    v2.4.4

Merge branch 'w14_MDL-38798_m24_php55' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 45edc141260fcbecc1325938f2073c102a73a48b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 09 Apr 2013 14:30:52 +0800
Tag:    v2.5.0-rc1

Merge branch 'w14_MDL-38798_m25_php55' of git://github.com/skodak/moodle

commit 6b9fc96f8e26c4dcb8960ad4f1d4542fa01b55f5
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 09 Apr 2013 14:21:32 +0800
Tag:    v2.4.4

Merge branch 'wip-MDL-38887-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE

commit eeb47dbd30da03dab3c3bdd23109dba83cd71413
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 09 Apr 2013 14:21:22 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-38887-m25' of git://github.com/marinaglancy/moodle

commit 163e0d3e706085455c092e3a243cc1c72f52979b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 09 Apr 2013 13:27:56 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38508-m' of git://github.com/andrewnicols/moodle

commit 37240ce5c6f4e1dc23708a6f6e7752a78f961cef
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 04 Apr 2013 15:07:01 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-38708-master' of git://github.com/marinaglancy/moodle

commit b8eb2f3dc6ed80e0e204019794502e8d0c878272
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 03 Apr 2013 16:48:53 +0800
Tag:    v2.5.0-beta

Merge branch 'm25_MDL-38745_SCORM_API_Debugging_trivial_issue' of git://github.com/scara/moodle

commit 45d7974cc9277bf0d4f72c34574baba763a75e40
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 03 Apr 2013 16:33:45 +0800
Tag:    v2.3.7

Merge branch 'MDL-38809_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 20a98af5259ad890bec8f82c0efdfcd478c2bbc8
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 03 Apr 2013 16:33:00 +0800
Tag:    v2.4.4

Merge branch 'MDL-38809_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit 7a2a430aa5f9e74cb89b6d117b5d87f7dc149e51
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 03 Apr 2013 16:32:42 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38809' of git://github.com/timhunt/moodle

commit 8963212472b6194be9d46f4b70e0c1275752839b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 27 Mar 2013 13:07:10 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38632' of git://github.com/stronk7/moodle

commit 9efd33dc6131ebf562f142d75bc30546b7d11110
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 27 Mar 2013 10:39:10 +0800
Tag:    v2.3.7

Merge branch 'MDL-38659_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE

commit 843093789d9379b5525eb5d54ac0f8c67bd27764
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 27 Mar 2013 10:38:48 +0800
Tag:    v2.4.4

Merge branch 'MDL-38659_24' of git://github.com/stronk7/moodle into MOODLE_24_STABLE

commit cf457c216997a8d0a9c7ab9480e84d5ecb54b13e
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 27 Mar 2013 10:38:31 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38659' of git://github.com/stronk7/moodle

commit be0eacf8839fdaaaea33374fc0cda2c10af058c7
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 26 Mar 2013 17:20:01 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38564-master' of git://github.com/ankitagarwal/moodle

commit d54bc60b33ea504ce73a41d886c9afac1c4039c0
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 26 Mar 2013 17:12:18 +0800
Tag:    v2.5.0-beta

Merge branch 'w13_MDL-38672_m25_purifier' of git://github.com/skodak/moodle

commit d5fc9f3d775937625f4df441de03eb77af0d69e6
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 14 Mar 2013 11:05:43 +0800
Tag:    v2.3.6

Merge branch 'MDL-38356-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE

commit ecbf8aee6eaec93c777343863357948dad797841
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 14 Mar 2013 11:03:54 +0800
Tag:    v2.4.3

Merge branch 'MDL-38356-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE

commit e1864424978333ede4a6ebed74299b596c9aa3d9
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 13 Mar 2013 14:59:47 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36990_master-neu' of git://github.com/grabs/moodle

commit 02dcf9b501d613c077fa51f5f0a35a477ef81c48
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 12 Mar 2013 16:53:45 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-35875-master' of git://github.com/phalacee/moodle

commit ca5cb4ccac99470cc9152ee7194bcf10e6c30c07
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 12 Mar 2013 15:55:17 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35615' of git://github.com/rwijaya/moodle

commit df6266825b1ec967b70f4aceca1c4df3f3663190
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 12 Mar 2013 15:50:55 +0800
Tag:    v2.3.6

Merge branch 'MDL-35615_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit 86070a3ed9fbaad3e19fe1637313a656b3fed88a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 12 Mar 2013 15:50:39 +0800
Tag:    v2.4.3

Merge branch 'MDL-35615_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE

commit 771053bd830410b435fe102b20fd4ccabbd4dd4a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 12 Mar 2013 13:38:10 +0800
Tag:    v2.3.6

Merge branch 'MDL-38356-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE

commit aebfad51a0704b474e7ac210332b4afc5129df06
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 12 Mar 2013 13:37:45 +0800
Tag:    v2.4.3

Merge branch 'MDL-38356-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE

commit e14cc639f177ed59773ebdf0c0080a1cbcd180ec
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 12 Mar 2013 13:37:25 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38356-m' of git://github.com/andrewnicols/moodle

commit c2fb582ef5491b59e59b37df692cc2c8069fdda5
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 12 Mar 2013 13:28:34 +0800
Tag:    v2.3.6

Merge branch 'MDL-35582_message_labels_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit 484dcc9b907f16f04c6975cae87913e0df79ec44
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 12 Mar 2013 13:27:19 +0800
Tag:    v2.4.3

Merge branch 'MDL-35582_message_labels_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE

commit 34bbe80617d9b16582f2a53cde80a93bd966081a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 12 Mar 2013 13:26:33 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35582_message_labels' of git://github.com/andyjdavis/moodle

commit 7b37b805d652c4bcee51681d9178b0723399bc61
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 12 Mar 2013 12:22:28 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36990_master-neu' of git://github.com/grabs/moodle

commit 46640b7e53846afb9cfb39881496e874e35a38f3
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 12 Mar 2013 11:35:03 +0800
Tag:    v2.4.3

Merge branch 'MDL-38386-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE

commit 58437b4cd36bd8425ae0b4f0ee3fced119355734
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 12 Mar 2013 10:49:18 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-mdl-35716' of git://github.com/rajeshtaneja/moodle

commit f19de35c1f5c52ecfa9804a473e7ee02ced5e3da
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 11 Mar 2013 15:41:03 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-31342_master' of git://github.com/gjb2048/moodle

commit c3d1c730769faa618664feb933436258f2681b5b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 07 Mar 2013 15:46:07 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38352-behat-fix' of git://github.com/dmonllao/moodle

commit c65e7fcbc8f8fcc6a1842cfa3d2e169c76a32f49
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 07 Mar 2013 10:41:52 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-33946_label_dndupload_text' of git://github.com/davosmith/moodle

commit 045a4173b1c372d5cf351a5c311cbf3cc86839c7
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 05 Mar 2013 17:14:02 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38209' of git://github.com/timhunt/moodle

commit 77e08c04d31a4f0a0be45fa7945fb22d0b0ce95c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 05 Mar 2013 17:07:50 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38072' of git://github.com/lazydaisy/moodle

commit b30fea4e05844f2695061c057edffd3456f45810
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 05 Mar 2013 17:04:05 +0800
Tag:    v2.3.5

Merge branch 'wip-MDL-34775-stable23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE

commit 57b0cfaaf1c0fc50465868b026c6b9da8cd5e98a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 05 Mar 2013 17:03:44 +0800
Tag:    v2.4.2

Merge branch 'wip-MDL-34775-stable24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE

commit 11abbe276f0263e6bd41c99cf7e2cb5921e98233
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 05 Mar 2013 17:01:54 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-34775-master' of git://github.com/phalacee/moodle

commit 810fb772c3b91dd8ba2a524ca8e0e5a148ae76d9
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 05 Mar 2013 16:00:49 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38240' of git://github.com/timhunt/moodle

commit c0da001c4901c8386447b6506bbfdd1c82dd2686
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 05 Mar 2013 14:43:46 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38025_master' of git://github.com/dmonllao/moodle

commit 212e5ee9090e4ba1f3a3db66a993f36e8a8790a8
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 05 Mar 2013 14:37:05 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38007_master' of git://github.com/dmonllao/moodle

commit c2b40106d3d01b565f71c98e66a7c23ffb69e3bd
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 05 Mar 2013 13:09:37 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-38251-m25' of git://github.com/samhemelryk/moodle

commit 792dab0f750f103b57fcb116b0cc468659e70efc
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 05 Mar 2013 12:56:40 +0800
Tag:    v2.3.5

Merge branch 'MDL-30481_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit a05b00c6867f3d6ee8f04c356a119f8616b88f5c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 05 Mar 2013 12:56:14 +0800
Tag:    v2.4.2

Merge branch 'MDL-30481_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE

commit da33f689dc451b41998592ffd91e59a74f2681ff
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 05 Mar 2013 12:55:41 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-30481' of git://github.com/rwijaya/moodle

commit d1e220eb0e897c1c82a5fdf5a4cb99d609d8479d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 05 Mar 2013 11:13:33 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36171-m' of git://github.com/andrewnicols/moodle

commit fb3c1d2b3481937cd05db9951ca2ed77002d5bae
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 05 Mar 2013 11:06:55 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38067-m' of git://github.com/andrewnicols/moodle

commit 23a6fca502c41f929bef90d5dabc9e5131892da9
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 05 Mar 2013 10:37:33 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-34300-m' of git://github.com/andrewnicols/moodle

commit b4f110f1a40f5e85cb87c2e613ecb91d67fa326d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 05 Mar 2013 10:21:25 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-33946_label_dndupload_text' of git://github.com/davosmith/moodle

commit 37c68301f94c225e6d479261a3a582e22f2bb60b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 29 Jan 2013 16:33:37 +0800
Tag:    v2.5.0-beta

Merge branch 'w04_MDL-37499_m25_authldaptest' of git://github.com/skodak/moodle

commit 46112c0277c3c68c2e3cda752108d3b1f1183819
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 23 Jan 2013 14:57:45 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37100-master' of git://github.com/ankitagarwal/moodle

commit e88dfd38bdca70f45dbb2126f05d8d1f40fdb03b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Jan 2013 16:28:53 +0800
Tag:    v2.3.5

Merge branch 'wip-mdl-37339-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit 1c7c33b314e1787d03fe8e486a8526427f37a666
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Jan 2013 16:28:39 +0800
Tag:    v2.4.2

Merge branch 'wip-mdl-37339-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE

commit 072844a158ac02217e02706e4c2131520a1e49c0
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Jan 2013 16:28:31 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-mdl-37339' of git://github.com/rajeshtaneja/moodle

commit 1a6192f9282c141ed7ad76be9cfaf8635e8474cf
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Jan 2013 13:57:25 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37547-master' of github.com:damyon/moodle

commit 447e59a1f289a8f8feb4281b75fe45d8d0ed7adb
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Jan 2013 12:10:48 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37541-master' of git://github.com/marinaglancy/moodle

commit 8b042b1cc82fcc7e1ba0422cd98ce8a0a869181a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Jan 2013 11:37:24 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37583' of git://github.com/timhunt/moodle

commit 60f95aad6ca27b6fde2c870ce597152b544518fa
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Jan 2013 11:08:16 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37585' of git://github.com/timhunt/moodle

commit 72455fca5a8724f8d035989bbf6a41bce5685af1
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Jan 2013 11:00:05 +0800
Tag:    v2.3.5

Merge branch 'MDL-37540-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

commit 3a6152ceac2b04b66fad7485c36e0cf8ed37abc6
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Jan 2013 10:59:53 +0800
Tag:    v2.4.2

Merge branch 'MDL-37540-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE

commit c0038fbe5be9122aecddcc67a86706b91adc501d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Jan 2013 10:59:26 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37540-master' of git://github.com/damyon/moodle

commit c90b8f82a846ee20994391a7c87a97026b982dda
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Jan 2013 10:56:54 +0800
Tag:    v2.3.5

Merge branch 'MDL-37543-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

commit 0e5bf3c4afd330560d61751a41eb2bfeb4df021e
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Jan 2013 10:56:38 +0800
Tag:    v2.4.2

Merge branch 'MDL-37543-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE

commit 5d4183b94fa63f39323b803ee6db4b1b7bd045a2
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Jan 2013 10:56:06 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37543-master' of git://github.com/damyon/moodle

commit 5650cdb8fc7a92282c090171ffad50c4b508301d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 21 Jan 2013 17:06:09 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37541-master' of git://github.com/marinaglancy/moodle

commit d971df89b15359c94e170df1d8dc12f8274928a6
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 21 Jan 2013 15:26:51 +0800
Tag:    v2.3.5

Merge branch 'w03_MDL-37559_m23_otherusers' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 72389d113328f775fc70f2a02b0cc713c9845ac3
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 21 Jan 2013 15:26:32 +0800
Tag:    v2.4.2

Merge branch 'w03_MDL-37559_m24_otherusers' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 93c62e0cd89ce76b1b4b216aa4f1d9698b1a5178
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 21 Jan 2013 15:26:13 +0800
Tag:    v2.5.0-beta

Merge branch 'w03_MDL-37559_m25_otherusers' of git://github.com/skodak/moodle

commit 4e0828c954ecff6bf0fa8ad25744c55db54418f7
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 21 Jan 2013 15:05:46 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37571' of git://github.com/tmuras/moodle

commit ebf5d99c6111762e53f30a38cf5408b31469246e
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 21 Jan 2013 12:49:15 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37591_master' of git://github.com/lazydaisy/moodle

commit 410fee1239c1e76da1fa9ed48f084545d13f4674
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 21 Jan 2013 12:38:13 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37592_master' of git://github.com/lazydaisy/moodle

commit 4e66b8908cb5c1f52940fdce46462da33ed0101f
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 11 Dec 2012 11:54:53 +0800
Tag:    v2.3.4

Merge branch 'w49_MDL-36817_m23_composer' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 552160e84484056aed61bc06a44b7cbcaf7f4390
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 03 Dec 2012 15:54:52 +0800
Tag:    v2.4.0

Merge branch 'MDL-36912-master' of git://github.com/FMCorz/moodle

commit ce84cbacb7168fb1cde437c5987d4285a2157402
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 03 Dec 2012 14:59:15 +0800
Tag:    v2.4.0

Merge branch 'MDL-36777-master' of git://github.com/FMCorz/moodle

commit 2d74d1aea3de631273ff86a24afa2dbbf1d1b2a7
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 30 Nov 2012 15:44:50 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36632-master' of git://github.com/FMCorz/moodle

commit 12995ef7d0dfd384af52c14222cc0cf87c568ee8
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 30 Nov 2012 15:32:15 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36774-master' of git://github.com/FMCorz/moodle

commit 7b1c48591141880493fac488023ee8628dc4483f
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 30 Nov 2012 15:21:05 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36765-master' of git://github.com/FMCorz/moodle

commit 5bd84c3fde7a7fd37ff36288319c087d03e9175d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 30 Nov 2012 15:05:41 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36869-master' of git://github.com/FMCorz/moodle

commit 8e1fbc0fe603bb3067b2dfa4f4625b26a108c54c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 29 Nov 2012 12:53:25 +0800
Tag:    v2.4.0-rc1

Merge branch 'master_MDL-36858' of git://github.com/danmarsden/moodle

commit f6183fa16289574223707a77ddc57d18c7348267
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 27 Nov 2012 16:26:08 +0800
Tag:    v2.3.4

Merge branch 'MDL-36865_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE

commit e002d5e4352d19a4bbffb72640251e958a0acb49
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 27 Nov 2012 16:20:26 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36865_master' of git://github.com/markn86/moodle

commit 63e2347e1c66af249605e6f9779170a1d958413c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 27 Nov 2012 15:49:32 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36710-master' of git://github.com/ankitagarwal/moodle

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 7cde2573d78850ad339385e67bd65f1fecd66735
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 27 Nov 2012 14:56:36 +0800
Tag:    v2.3.4

Merge branch 'MDL-36841_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE

commit a58be8a9f17f8cd67859a64810baa42dc5aab306
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 27 Nov 2012 14:56:03 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36841_master' of git://github.com/markn86/moodle

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 f441ec25645527a0619fc7c7b2f475a0d26f3e8c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 27 Nov 2012 12:20:25 +0800
Tag:    v2.3.4

Merge branch 'wip-mdl-36767-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit 720ee26d4a5773d68229391408ec9e6b50b9b340
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 27 Nov 2012 12:19:52 +0800
Tag:    v2.4.0-rc1

Merge branch 'wip-mdl-36767' of git://github.com/rajeshtaneja/moodle

commit ec03ca7272aa6b07b7912f483882343c59422e0c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 27 Nov 2012 12:02:14 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36710-master' of git://github.com/ankitagarwal/moodle

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 4505720f3e9db09354d73e8a57b037dc3d7f062c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 27 Nov 2012 11:53:09 +0800
Tag:    v2.3.4

Merge branch 'MDL-36305-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 0319316444d8c16a8f2db395c448f48795acb4d7
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 27 Nov 2012 11:52:50 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36305-master' of git://github.com/FMCorz/moodle

commit 9735135db74887e3b120c5887e0a9b7cd4f0a66b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 23 Nov 2012 14:47:25 +0800
Tag:    v2.4.0-rc1

Merge branch 'w47_MDL-36780_m24_redirect' of git://github.com/skodak/moodle

commit 020e338deea5a9d8be0d6b49fab18189a00d2049
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 22 Nov 2012 16:23:20 +0800
Tag:    v2.4.0-rc1

Merge branch 'w47_MDL-36701_m24_composer' of git://github.com/skodak/moodle

commit 6bf410ed4b0c968a670792db9fef767a27e9c879
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 21 Nov 2012 10:29:04 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36614-master' of git://github.com/ankitagarwal/moodle

commit 862606800186061f7bf05ef02a54b90ab5e9bd64
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 20 Nov 2012 16:28:00 +0800
Tag:    v2.3.4

Merge branch 'wip-mdl-36707-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit 4bb2e5c4b28c2a8b34e628e2ea56651a4478c52f
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 20 Nov 2012 16:22:27 +0800
Tag:    v2.4.0-rc1

Merge branch 'wip-mdl-36707' of git://github.com/rajeshtaneja/moodle

commit 244e907235d71ffaca6a1e5d69e7dc3614d2cc2a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 15 Nov 2012 11:15:00 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-30643_master-log-speed' of git://github.com/tbannister/moodle

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 4093331badeeff7cec11a10108b7dd253c0e3467
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 14 Nov 2012 09:13:30 +0800
Tag:    v2.3.4

Merge branch 'wip_23_mdl-25736_tinymce_spellchecker_frech_issues' of https://github.com/iarenaza/moodle into MOODLE_23_STABLE

commit f132d28aa57713a3aa6fe9b7ac8ddab54e5a6e45
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 14 Nov 2012 09:12:28 +0800
Tag:    v2.4.0-rc1

Merge branch 'wip_master_mdl-25736_tinymce_spellchecker_frech_issues' of https://github.com/iarenaza/moodle

commit 79fc5f5294af9bf041b343ff7cb59319abcac0e1
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 12 Nov 2012 14:29:45 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-30643_master-log-speed' of git://github.com/tbannister/moodle

commit 6c4e88642602f1074df543900733d619c0be7a1e
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 09 Nov 2012 14:16:15 +0800
Tag:    v2.4.0-beta

Merge branch 'WIP-MDL-35512' of git://github.com/nadavkav/moodle

commit 60c7fc96b226f3a003a31dcb4fea646557cbbb02
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 09 Nov 2012 14:15:07 +0800
Tag:    v2.3.3

Merge branch 'WIP-MDL-35512-M23' of git://github.com/nadavkav/moodle into MOODLE_23_STABLE

commit 3d9514b3632b8d105784321772fa9a9689c9c1a0
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 09 Nov 2012 14:11:42 +0800
Tag:    v2.3.3

Merge branch 'MDL-35510_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit 97bf72055d2956d9cf74e51de04f2286af60f67c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 09 Nov 2012 14:09:11 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35510_master' of git://github.com/lazydaisy/moodle

commit 1f9041e42a1a0c5a64c4c2edf5d1e8e5a22be7c5
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 09 Nov 2012 10:33:26 +0800
Tag:    v2.4.0-beta

Merge branch 'WIP-MDL-35566' of git://github.com/nadavkav/moodle

commit 79d86ffcdbf6dd3e3b7eeb59d606a433586f766d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 09 Nov 2012 10:27:32 +0800
Tag:    v2.3.3

Merge branch 'MDL-35571_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit 553cc78952286d3711f9031ee7e26b070164b9b2
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 09 Nov 2012 10:27:11 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35571_master' of git://github.com/lazydaisy/moodle

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 edd4257a1a7d100a90902692b405c77f13a8b81c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 08 Nov 2012 13:32:27 +0800
Tag:    v2.3.3

Merge branch 'MDL-27824_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit 4b1466d50cd4ff959791d8e9ec514d2481a43728
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 08 Nov 2012 13:26:39 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-27824' of git://github.com/rwijaya/moodle

commit c770f07155ec550a20868adb75f799677f0d7590
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 05 Nov 2012 10:27:57 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-31824-master' of git://github.com/phalacee/moodle

commit 9b18e58bcb2af77441d6fbe76dc840e92891349a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 31 Oct 2012 14:51:16 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-36130' of git://github.com/aolley/moodle

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 046c9872a69377da02e173e91277dcb8fc5bc295
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 31 Oct 2012 10:05:26 +0800
Tag:    v2.3.3

Merge branch 'MDL-31708-moodle23' of git://github.com/StudiUM/moodle into MOODLE_23_STABLE

commit 07e3b0f17d7bf20327186a69697c6d17389a26ab
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 31 Oct 2012 10:04:56 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-31708-master' of git://github.com/StudiUM/moodle

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 1025a9123f8453d2a2fe8cfac76df4ed5b03d5aa
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 18 Oct 2012 19:21:29 +0800
Tag:    v2.3.3

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit f28b5590307f2aa46fb1e1fb7046477d7135d2a2
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 18 Oct 2012 19:20:30 +0800
Tag:    v2.4.0-beta

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit a9dd30802ded1384203f0c4ef79e77f9029debea
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 18 Oct 2012 03:45:06 +0800
Tag:    v2.4.0-beta

Merge branch 'WIP-MDL-35583' of git://github.com/nadavkav/moodle

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 dde33d64a25ea81b5a2e45122765a88888e070e2
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 17 Oct 2012 10:40:03 +0800
Tag:    v2.3.3

Merge branch 'MDL-28965-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit c6ad4652293385f219d70dc59a34414c8d66423e
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 17 Oct 2012 08:25:27 +0800
Tag:    v2.4.0-beta

Merge branch 'WIP-MDL-35583' of git://github.com/nadavkav/moodle

commit 2872bd5101ffc93d8e7fb1d528d538bf28bf0930
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 16 Oct 2012 11:08:01 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-35850-master' of git://github.com/abgreeve/moodle

commit cb6b5fb6256bf32592b6a44fcc1742ac4ae92486
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 16 Oct 2012 10:46:11 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-35265-master' of git://github.com/abgreeve/moodle

commit 43d333cb585c20c9aba1060ffcdd2b945fcac4b3
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 15 Oct 2012 16:36:38 +0800
Tag:    v2.4.0-beta

Merge branch 'master_MDL-35418' of git://github.com/danmarsden/moodle

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 60e1dfd0786ff96304034c907fab1d9489e03e78
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 15 Oct 2012 15:53:40 +0800
Tag:    v2.3.3

Merge branch 'MDL-31010-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit 353d6457b79375c690928309b30d2e607936bdca
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 15 Oct 2012 15:53:22 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-31010-master' of git://github.com/ankitagarwal/moodle

commit 8cbd15a761a2497837197892adf5f2fc9ef2b278
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 15 Oct 2012 15:17:44 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-28965-master' of git://github.com/ankitagarwal/moodle

commit de5a44eb3a77198d3e9ed352a737de4cd1631c34
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 15 Oct 2012 14:36:02 +0800
Tag:    v2.4.0-beta

Merge branch 'w42_MDL-36031_m24_messagesink' of git://github.com/skodak/moodle

commit af6b7edaeeadc0b07de98014047ac94b7c5996b4
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 15 Oct 2012 14:21:11 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-30845-master' of git://github.com/ankitagarwal/moodle

commit 226398e7d0fdb0b534900cfeeb198bda2e0bcd96
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 15 Oct 2012 14:16:06 +0800
Tag:    v2.3.3

Merge branch 'MDL-35986' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit ca93b3af4e8a51bc3ad98e1a7151305694161786
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 10 Oct 2012 13:03:23 +0800
Tag:    v2.3.3

Merge branch 'MDL-35231_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit 364ca5d216b11907e2ed48fef4a28d289cfbad6f
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 10 Oct 2012 13:01:32 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35231_master' of git://github.com/lazydaisy/moodle

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 1778232f456856647679f6594b240a4c05042238
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 10 Oct 2012 10:32:02 +0800
Tag:    v2.3.3

Merge branch 'w41_MDL-35839_m23_enroldeletecleanup' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit e5dba28cca3258621a4ebcdcac7f791eb0d46d0c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 10 Oct 2012 10:29:33 +0800
Tag:    v2.4.0-beta

Merge branch 'w41_MDL-35839_m24_enroldeletecleanup' of git://github.com/skodak/moodle

commit e72606c83fb5cee71597550a7eacf9f18f7015e8
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 09 Oct 2012 16:28:49 +0800
Tag:    v2.3.3

Merge branch 'MDL-35587_23' of git://github.com/rlorenzo/moodle into MOODLE_23_STABLE

commit 832e5f59572b11d4acb69840af22bbdae0809ef8
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 09 Oct 2012 16:27:28 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35587' of git://github.com/rlorenzo/moodle

commit cbc15c76ea534f8c58e038b8186e7086e53bfb34
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 09 Oct 2012 15:40:20 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34819-master' of git://github.com/StudiUM/moodle

commit 50cef6aa36b2d00c1376a4d23fe8ff8ee71a2b34
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 09 Oct 2012 14:32:31 +0800
Tag:    v2.3.3

Merge branch 'wip-MDL-30754-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE

commit 7b1c902accd3f92dafc0162b8a33c0b15284d722
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 09 Oct 2012 14:32:13 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-30754-m24' of git://github.com/samhemelryk/moodle

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 976a9da987de7b9a23051afc8ff545e6f681a637
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 09 Oct 2012 14:11:32 +0800
Tag:    v2.3.3

Merge branch 'WIP-MDL-35724-M23_quiz' of git://github.com/nadavkav/moodle into MOODLE_23_STABLE

commit 42239bd24cba5f205550423f636ee343878cb34a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 09 Oct 2012 14:05:04 +0800
Tag:    v2.4.0-beta

Merge branch 'WIP-MDL-35724-master_quiz' of git://github.com/nadavkav/moodle

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 34983250b16c6368627d7b9d99d129edfec4fa0f
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 09 Oct 2012 11:53:43 +0800
Tag:    v2.3.3

Merge branch 'MDL-35776_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 84c04ff295a211edde23a3e0495b961df429a39a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 09 Oct 2012 11:53:12 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35776' of git://github.com/timhunt/moodle

commit 97512b094d409073b13a36bf4cd28d1649ac2e89
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 09 Oct 2012 10:55:26 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35802' of git://github.com/timhunt/moodle

commit ae48ff8a1723f7c3aa7b4373957a7143bb05823a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 09 Oct 2012 10:25:33 +0800
Tag:    v2.3.3

Merge branch 'MDL-35837-M23' of git://github.com/nadavkav/moodle into MOODLE_23_STABLE

commit 99baba4079cfcbadd0719cd6621e9040ba3acd17
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 09 Oct 2012 10:16:30 +0800
Tag:    v2.4.0-beta

Merge branch 'w41_MDL-35795_m24_hebrewunzip' of git://github.com/skodak/moodle

commit c116bd70a022d404df40039777f3675d5be82203
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 08 Oct 2012 17:26:45 +0800
Tag:    v2.3.3

Merge branch '23STABLE-wip-MDL-35694' of git://github.com/jennymgray/moodle into MOODLE_23_STABLE

commit db739bf096c2736708f201a9654785e2ea94ad0b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 08 Oct 2012 17:24:53 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-35694' of git://github.com/jennymgray/moodle

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 e4feb70b6628036c6bdf83bff17a440b8e531465
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 08 Oct 2012 17:16:12 +0800
Tag:    v2.3.3

Merge branch 'WIP-MDL-35723-M23_quiz' of git://github.com/nadavkav/moodle into MOODLE_23_STABLE

commit 1c5f03fd4a22366c1fa6fe1ea69fb271094a6caa
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 08 Oct 2012 17:15:41 +0800
Tag:    v2.4.0-beta

Merge branch 'WIP-MDL-35723-master_quiz' of git://github.com/nadavkav/moodle

commit 785bc3bca9b26ad62ae9bb94129a754050714835
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 08 Oct 2012 17:06:43 +0800
Tag:    v2.3.3

Merge branch 'w41_MDL-35739_m23_cliinstall' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit e1aa59b9e4b7a5b9bac9bc2bb91de1aa53c004ed
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 08 Oct 2012 17:06:06 +0800
Tag:    v2.4.0-beta

Merge branch 'w41_MDL-35739_m24_cliinstall' of git://github.com/skodak/moodle

commit 30ee1d93be0bd58631af8bd6a20c01183af805d5
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 08 Oct 2012 16:42:03 +0800
Tag:    v2.4.0-beta

Merge branch 'w41_MDL-35814_m24_delinstance' of git://github.com/skodak/moodle

commit 90dd427cf780694bf82f710ceb44debbfc3a14be
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 08 Oct 2012 15:59:39 +0800
Tag:    v2.4.0-beta

Merge branch 'w41_MDL-35695_m24_authdb' of git://github.com/skodak/moodle

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 e7afca94681e2d772762e9208a50dbbfee575ba4
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 08 Oct 2012 15:28:37 +0800
Tag:    v2.3.3

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

commit d26a3d2b6fcd3c37f728b9b7aa4ea1e685076aab
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 08 Oct 2012 15:23:20 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35728' of git://github.com/netspotau/moodle-mod_assign

commit af312fdb12e422ed77729cf56aa6eef5f4ba283d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 08 Oct 2012 15:12:54 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-mdl-35784' of git://github.com/rajeshtaneja/moodle

commit dbce42a7c22fb611fce3e57136dafccc118fe7ff
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 08 Oct 2012 14:59:07 +0800
Tag:    v2.4.0-beta

Merge branch 'w41_MDL-35814_m24_delinstance' of git://github.com/skodak/moodle

commit 9f8ffac3b8832919d287b0b1c10d4f28884a7c49
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 08 Oct 2012 14:20:04 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-34448-master' of git://github.com/abgreeve/moodle

commit bf6d9e8c21188ccea25a58a24d6a90a764e97edf
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 12 Sep 2012 14:47:50 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35264_fix' of git://github.com/dmonllao/moodle

commit 55fcd5678ecdf55d7b0fd5f0bb986cd4cc473afe
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 12 Sep 2012 14:26:34 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34967' of git://github.com/mouneyrac/moodle

commit 5c7cca95e7b92e82b0cf0bb04da88dcb1c69a423
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 11 Sep 2012 19:12:29 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34970' of git://github.com/mouneyrac/moodle

commit 5e7e3bc20f06362b7f898ef692c9faa8346a1efe
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 11 Sep 2012 18:41:01 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34972' of git://github.com/mouneyrac/moodle

commit 96e5f78a6e1c6b0321a29a544ab97ec973e30e9e
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 11 Sep 2012 17:16:20 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34973' of git://github.com/mouneyrac/moodle

commit f4f1fd0b6c562911eec9afe3e9bc281fa8a71b1a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 11 Sep 2012 16:39:30 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-31276-NOCSVLIB' of git://github.com/netspotau/moodle-mod_assign

commit 27fec8650b05225147ab6d4b52cc86d4cff66fda
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 11 Sep 2012 14:46:44 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-29463-master' of git://github.com/phalacee/moodle

commit 47d474b66cb0a0aed300adb75cbbf2b7caea5ee7
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 11 Sep 2012 11:05:25 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-30898-master' of git://github.com/phalacee/moodle

commit 2873330588c5666f727955848a5288d0607470a4
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 11 Sep 2012 09:19:33 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-30818-master' of git://github.com/phalacee/moodle

commit 6c990952c9d0829e973d5e209081f271f331ac00
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 10 Sep 2012 17:15:31 +0800
Tag:    v2.3.3

Merge branch 'MDL-34944-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit e2abebcbb2e359b9bc0a80cae86ab7365b5ee6f6
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 10 Sep 2012 17:15:00 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34944-master' of git://github.com/ankitagarwal/moodle

commit 1b1c35541a0827d485c1811454d04bf8d52e999a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 10 Sep 2012 17:00:47 +0800
Tag:    v2.3.3

Merge branch 'MDL-35223-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit b3b79a58eeea3a421491e799c3ecd0490bce68c7
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 10 Sep 2012 17:00:16 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35223-master' of git://github.com/ankitagarwal/moodle

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 49d994791477584d4d0f368d76541d907caafb1b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 10 Sep 2012 14:39:01 +0800
Tag:    v2.3.3

Merge branch 'MDL-35264_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE

commit 5ddaa60d498f26c2a9576d275a6e18abda4c49cd
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 10 Sep 2012 14:37:40 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35264_master' of git://github.com/dmonllao/moodle

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 4ad7bc830e5bd7c450581acc5a295335164d8b42
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 10 Sep 2012 14:30:57 +0800
Tag:    v2.3.3

Merge branch 'MDL-27398_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE

commit fda1d233a7eb89fab2e3fb8d3dd33facc345aae2
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 10 Sep 2012 14:29:47 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-27398_master' of git://github.com/dmonllao/moodle

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 9111b11b7b7efa6bf4b10887111969e80d1f07f3
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 10 Sep 2012 13:42:36 +0800
Tag:    v2.3.3

Merge branch 'MDL-34068_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE

commit d59b488b5a7adb7c2bd4a3a2c2c90036dd98f82d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 06 Sep 2012 19:43:15 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-31291-POST23' of git://github.com/netspotau/moodle-mod_assign

commit 89577d774d85de37cedd6df0af2797d2e6414b0a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 06 Sep 2012 19:36:24 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-31284-POST23' of git://github.com/netspotau/moodle-mod_assign

commit 69a52e7c4f3d95c5d62667443e44c3533a01e5b0
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 05 Sep 2012 15:08:38 +0800
Tag:    v2.3.2

Merge branch 'MDL-35089_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE

commit 379833e0d09b231bf4086da53bb64b838b70c227
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 05 Sep 2012 15:02:17 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35089' of git://github.com/stronk7/moodle

commit 01ba041fa65be8eb6e17dcdca35faf22d33ae522
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 05 Sep 2012 11:45:56 +0800
Tag:    v2.4.0-beta

Merge branch 'w36_MDL-35177_m24_editoradminicons' of git://github.com/skodak/moodle

commit b0381539e5d32c1747ebc2152e55d76f060d465a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 05 Sep 2012 01:16:51 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-30643_master-log-speed' of git://github.com/tbannister/moodle

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 4ec133b8e60bb5fe4026c9a17ec46f3ae5ab2469
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 04 Sep 2012 17:32:51 +0800
Tag:    v2.3.2

Merge branch 'wip-mdl-34537-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit c43f715d4220517ff242badd04eb337e7e47199a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 04 Sep 2012 17:31:50 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-mdl-34537' of git://github.com/rajeshtaneja/moodle

commit 736cc6a24691634468d578fe88881e4dd24a7347
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 04 Sep 2012 13:43:11 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-26504_blog_unregister' of git://github.com/andyjdavis/moodle

commit 8f8e28c0b6f54ea02f2d458fa257524da0a1d47e
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 04 Sep 2012 11:38:11 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-31365_master' of https://github.com/birdy1976/moodle

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 e78698c6067fe3b91a1bf32de8b8b013f87e4b0f
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 03 Sep 2012 19:23:52 +0800
Tag:    v2.3.2

Merge branch 'MDL-35151_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit 4da70893ef3fb188b3b7f6825e9222fa57559186
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 03 Sep 2012 19:21:29 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35151_master' of git://github.com/lazydaisy/moodle

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 a2bdb0b02cbd81181b50e354b01954d32b4282c9
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 03 Sep 2012 17:38:07 +0800
Tag:    v2.3.2

Merge branch 'MDL-35180_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit 3c59897f79862c0928f560f3c78f27d926d6f0df
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 03 Sep 2012 17:37:29 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35180_master' of git://github.com/lazydaisy/moodle

commit 90c499dbca48eb9a5b645e7f4f7276892bdb7c7e
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 03 Sep 2012 17:12:32 +0800
Tag:    v2.3.2

Merge branch 'w36_MDL-35080_m23_weirdtables' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit bb048c6afa9e8ef30851633d76c23a0ae95977c6
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 03 Sep 2012 17:09:23 +0800
Tag:    v2.4.0-beta

Merge branch 'w36_MDL-35080_m24_weirdtables' of git://github.com/skodak/moodle

commit e51861e0eaaed141b1787f3279b2b4ccc8e9deda
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 30 Aug 2012 11:37:47 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-32108-master' of git://github.com/abgreeve/moodle

commit bc67dfdb9a12ad629a92dd6e10f765eeb8baab73
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 30 Aug 2012 10:43:38 +0800
Tag:    v2.3.2

Merge branch 'MDL-35010_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE

commit 2e8bf83d1b502ce868ca7ce26828183c5bfb67e9
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 30 Aug 2012 10:38:15 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35010' of git://github.com/stronk7/moodle

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 accaf1d277219111362d193f8c7d3989f31a4565
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 29 Aug 2012 16:57:09 +0800
Tag:    v2.3.2

Merge branch 'wip-mdl-31623-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit 42ac7cf123e4f0a5310a15a502d75e1a5643e9f7
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 29 Aug 2012 16:57:03 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-mdl-31623' of git://github.com/rajeshtaneja/moodle

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 fd3e329d941f74fa7e1a885d7d0ab1c086538adb
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 29 Aug 2012 15:33:43 +0800
Tag:    v2.3.2

Merge branch 'MDL-31959_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit 730d005383999fb51645e87b671d471af43eb995
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 29 Aug 2012 15:33:31 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-31959' of git://github.com/rwijaya/moodle

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 8be5407bc12b83ab85c286a4da9c454a460ef126
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 29 Aug 2012 13:46:04 +0800
Tag:    v2.4.0-beta

Merge branch 'w35_MDL-35064_m24_delenrol' of git://github.com/skodak/moodle

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 913dd6d630e9ddaf10c3152defcc22360ad4097a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 29 Aug 2012 13:27:05 +0800
Tag:    v2.3.2

Merge branch 'MDL-34952_23' of git://github.com/grabs/moodle into MOODLE_23_STABLE

commit 8df000885658947d08944920e4b6ad5ffad2da4c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 29 Aug 2012 13:26:51 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34952_master' of git://github.com/grabs/moodle

commit a476581f0d49f5891e907391c78ba0b887f7ed92
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 29 Aug 2012 12:38:17 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-34075-master' of git://github.com/abgreeve/moodle

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 4eb3f12797b89229397cf4cd2eb68eb920178e0d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Aug 2012 17:04:19 +0800
Tag:    v2.3.2

Merge branch 'MDL-31837_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 23d82edc91bd97793d281ea8cf0c1396d7a35d27
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Aug 2012 17:03:55 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-31837' of git://github.com/timhunt/moodle

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 6ec3ae6f14ad71ca51242c9edf810e817960fb63
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Aug 2012 16:54:31 +0800
Tag:    v2.3.2

Merge branch 'MDL-32464_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit a4290d580323652b2804a8a2e4c35bb5b72c1172
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Aug 2012 16:53:41 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-32464' of git://github.com/timhunt/moodle

commit 55fa9f1fa0f0495e3171ea5f162a1da6d0ba8029
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Aug 2012 15:43:19 +0800
Tag:    v2.4.0-beta

Merge branch 'w35_MDL-34990_m24_tinymcebuttonsfix' of git://github.com/skodak/moodle

commit 46554970052dde86817409d0b12c6aacd3a12671
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Aug 2012 15:39:42 +0800
Tag:    v2.4.0-beta

Merge branch 'w35_MDL-34879_m24_tinymcedocs' of git://github.com/skodak/moodle

commit 1dd73f963c4c15527f89c4a045dff3fd7439a2a4
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Aug 2012 15:10:35 +0800
Tag:    v2.4.0-beta

Merge branch 'w35_MDL-34955_m24_tinycefinal' of git://github.com/skodak/moodle

commit edcdd37525d3289d09845e2ce44e823a9eb4f99e
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Aug 2012 15:00:26 +0800
Tag:    v2.4.0-beta

Merge branch 'w35_MDL-34878_m24_tinymcebuttons' of git://github.com/skodak/moodle

commit 0c4ee46d771493f75671b751688eba6285d9c379
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Aug 2012 13:56:15 +0800
Tag:    v2.4.0-beta

Merge branch 'w35_MDL-34877_m24_tinymcesettings' of git://github.com/skodak/moodle

commit 9455f48280be1cae86049e53f533a98f2fb681c4
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Aug 2012 11:45:11 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34549-master' of git://github.com/ankitagarwal/moodle

commit 6d04dc705c99546e4dc03a39a4095b797a60a4d8
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Aug 2012 11:35:24 +0800
Tag:    v2.4.0-beta

Merge branch 'w35_MDL-35052_m24_disabledenrol' of git://github.com/skodak/moodle

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 48ee721e2f9978c39c11c365104bf36164ae61ea
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 27 Aug 2012 17:26:41 +0800
Tag:    v2.3.2

Merge branch 'MDL-31633-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit f6bc04fe8aba56301ed705895a864bc1c2592167
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 27 Aug 2012 17:26:14 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-31633-master' of git://github.com/ankitagarwal/moodle

commit 5cbda7268424d6a591e37be49a5a6b2ebbbac55c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 27 Aug 2012 17:07:46 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34907' of git://github.com/raymondAntonio/moodle

commit 889754ad31326e696d74c4603083015f0fae95ae
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 27 Aug 2012 16:56:03 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35004' of git://github.com/raymondAntonio/moodle

commit 42122854fc8d22f31d9621abfd01d70f3cb57193
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 27 Aug 2012 14:20:30 +0800
Tag:    v2.3.2

Merge branch 'MDL-34936-MOODLE_23_STABLE-1' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE

commit a1a5d8968efb1d254dc5b32c9a4ac0f4c07cdae5
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 27 Aug 2012 14:20:15 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34936-master-1' of git://github.com/andrewnicols/moodle

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 7c3fa05126b3ec102fa8fcb3a704f86326255897
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 27 Aug 2012 13:46:50 +0800
Tag:    v2.3.2

Merge branch 'MDL-34996_23' of git://github.com/grabs/moodle into MOODLE_23_STABLE

commit d835cdb6276e1a3db8193a88b79a57d94f921cd5
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 27 Aug 2012 13:46:40 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34996_master' of git://github.com/grabs/moodle

commit ed170bd86c8468977073af788015c19b9d3bba1b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 27 Aug 2012 12:04:45 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-34429-master' of git://github.com/abgreeve/moodle

commit 7cc32281fc851d73d97d5ac61664785afad3bd54
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 27 Aug 2012 11:30:44 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-32386b' of git://github.com/srynot4sale/moodle

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 19ab59bcc00d701132845d1fd9e62161a9c21bad
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 16 Aug 2012 11:51:35 +0800
Tag:    v2.3.2

Merge branch 'MDL-34565_accessibility_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit 01ac783fb8244b462d3d3c8bac681821689bd2b0
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 16 Aug 2012 11:51:23 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34565_accessibility' of git://github.com/rwijaya/moodle

commit dbf2c5bfef6ef18df3ff6f0b8603a31262908d00
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 15 Aug 2012 10:01:46 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-22773' of git://github.com/bostelm/moodle

commit 50f0c35dd3d2d4597e2f39672471b1010f036ed0
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 14 Aug 2012 15:48:19 +0800
Tag:    v2.4.0-beta

Merge branch 'master_MDL-34382_add_new_option_to_flag_modules_that_support_plagiarism_plugins' of git://github.com/kanikagoyal/moodle

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 38ace2266f8fd295d5b177d0e699a944d14aef97
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 14 Aug 2012 15:30:03 +0800
Tag:    v2.3.2

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

commit 6a9718f254f5edf1415bb27e627974f69609e86f
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 14 Aug 2012 15:29:42 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-34748-master' of git://github.com/marinaglancy/moodle

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 69e0f5049f863ef2020f4b1185f1993317589850
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 14 Aug 2012 14:34:43 +0800
Tag:    v2.3.2

Merge branch 'MDL-34563_accessibility_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit 1474543a20b1a87b9ebdec6f14d4bfe1a06816de
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 14 Aug 2012 14:34:19 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34563_accessibility' of git://github.com/rwijaya/moodle

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 37fbfb0dda6f9b3dee889c0e66ba7a7baaae2905
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 14 Aug 2012 13:53:34 +0800
Tag:    v2.3.2

Merge branch 'MDL-34565_accessibility_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit 9fe8a6e02f36383480c9e693e01acd5849d34ef5
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 14 Aug 2012 13:53:19 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34565_accessibility' of git://github.com/rwijaya/moodle

commit 060eaca70edb8fe9b3323aa932d925d3d8a2a003
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 14 Aug 2012 10:55:49 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-32344_master' of git://github.com/dmonllao/moodle

commit b567fcfb508ab5815870e5c27d7a9fd6a08d58a6
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 13 Aug 2012 11:03:43 +0800
Tag:    v2.4.0-beta

Merge branch 'w33_MDL-34851_m24_enrolledsince' of git://github.com/skodak/moodle

commit b039a627b2c7444320b3abe04b8d18bcd21a74ef
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 13 Aug 2012 11:02:43 +0800
Tag:    v2.4.0-beta

Merge branch 'w33_MDL-34852_m24_enroledit' of git://github.com/skodak/moodle

commit 2cfd8f9427747d6db4b4e543b9e9ed80fa5fa1d5
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 13 Aug 2012 10:16:03 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34337-master' of git://github.com/ankitagarwal/moodle

commit e9b5490e29da4cbe05e5409483916316843be37b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 13 Aug 2012 10:10:15 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34336-master' of git://github.com/ankitagarwal/moodle

commit 19c9f39eb9721b62847916ef3ff28f5855490ceb
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 08 Aug 2012 11:16:25 +0800
Tag:    v2.4.0-beta

Merge branch 'w32_MDL-34505_m24_dbsuspend' of git://github.com/skodak/moodle

commit 80742be46a9d4d2a1582c7c88d51c6092c10aa13
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 08 Aug 2012 11:15:34 +0800
Tag:    v2.4.0-beta

Merge branch 'w32_MDL-13363_m24_dbuserundelete' of git://github.com/skodak/moodle

commit e2036435391a0b8d129e5f0a55a97bb4654cb59f
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 07 Aug 2012 15:58:25 +0800
Tag:    v2.3.2

Merge branch 'm23_MDL-33942' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

commit 056640610de3d0a586c360fe33a4b40f9b0cf78e
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 07 Aug 2012 15:58:06 +0800
Tag:    v2.4.0-beta

Merge branch 'master_MDL-33942' of git://github.com/danmarsden/moodle

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 5b7417093281743715ad7dd739407f352a8780ce
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 07 Aug 2012 15:07:51 +0800
Tag:    v2.3.2

Merge branch 'MDL-34566_accessibility_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit 0c36e633f57280b689a005b2c29b5a3f8a27659b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 07 Aug 2012 15:07:40 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34566_accessibility' of git://github.com/rwijaya/moodle

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 16daaa05b6e1e969547b3bddee0025e3f495c69f
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 07 Aug 2012 14:57:54 +0800
Tag:    v2.3.2

Merge branch 'MDL-34564_accessibility_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit 0367f6b1aa019a16d605eeab116ed5a56939453c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 07 Aug 2012 14:57:34 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34564_accessibility' of git://github.com/rwijaya/moodle

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 b21388d6db5a0d1b667edc2eac482c8641716721
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 07 Aug 2012 14:45:46 +0800
Tag:    v2.3.2

Merge branch 'MDL-34560_accessibility_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit 2efd02caa69b9e3f8676d23857a30ad5ef8274fe
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 07 Aug 2012 14:45:29 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34560_accessibility' of git://github.com/rwijaya/moodle

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 16a8d4d4ba9855fd5942172abb79d9edd41552e8
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 07 Aug 2012 14:37:05 +0800
Tag:    v2.3.2

Merge branch 'MDL-34559_accessibility_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit 12fd98242cc1c1552bf8e9038ec27a9353745362
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 07 Aug 2012 14:36:48 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34559_accessibility' of git://github.com/rwijaya/moodle

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 162510801f6c639ac07632b7a0a8ef1e6c90e7fa
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 07 Aug 2012 13:58:15 +0800
Tag:    v2.3.2

Merge branch 'MDL-28531-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit e5d9cc13ac85df5fbd501ed1bc609875c829d3e1
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 07 Aug 2012 13:58:07 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-28531-master' of git://github.com/FMCorz/moodle

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 5af69f5282a282b4ef1cdce9291865ed20f6f185
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 07 Aug 2012 10:42:11 +0800
Tag:    v2.3.2

Merge branch 'MDL-34715-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 20c3e2534342bba4f6379573fbe28c89e0ec1d54
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 07 Aug 2012 10:40:22 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34715-master' of git://github.com/FMCorz/moodle

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 04e428f9aece3c4aeaa0942c4902d261a334db94
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 07 Aug 2012 10:00:49 +0800
Tag:    v2.3.2

Merge branch 'MDL-22663-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 99f868c5414671b9556fc1ef0f7cf97bc519661c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 07 Aug 2012 10:00:26 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-22663-master' of git://github.com/FMCorz/moodle

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 b418329b7dd149f93f079894acff04f3773306fe
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 07 Aug 2012 09:23:48 +0800
Tag:    v2.3.2

Merge branch 'MDL-33022' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit 7b3c1c9d8ca872ddcf5df8954b1f4431e0c26587
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 07 Aug 2012 09:18:02 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33022-master' of git://github.com/danpoltawski/moodle

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 1e778228a89defc89158c2dc4fd38af8b5687f61
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 06 Aug 2012 16:43:55 +0800
Tag:    v2.3.2

Merge branch 'MDL-31599-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit fb87c4c96c59d4eb37946bd8d30b3da8e226a7af
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 06 Aug 2012 16:43:19 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-31599' of git://github.com/danpoltawski/moodle

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 b42abe0ffc98195e1b0797b4580e4934e05808e2
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 06 Aug 2012 16:38:04 +0800
Tag:    v2.3.2

Merge branch 'MDL-34716' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit 78797b36437e9453677c5a1cc39e26ab9dc33796
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 06 Aug 2012 16:37:46 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34716-master' of git://github.com/danpoltawski/moodle

commit 1f3d01f169df1bc08d022e402774063e9895e8ab
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 06 Aug 2012 16:23:05 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-22937_message_html2' of git://github.com/andyjdavis/moodle

commit 6df08cac3e41da6efc282c09a825c592c4b115d0
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 01 Aug 2012 09:30:34 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-31288-POST23' of git://github.com/netspotau/moodle-mod_assign

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 4a5780ffde1050f68e0ba1a5e5adb4e24edb146d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 31 Jul 2012 13:20:24 +0800
Tag:    v2.3.2

Merge branch 'MDL-34650_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit 87c12fec131737be370fa4c94786aa7d993c66b9
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 31 Jul 2012 13:19:47 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34650' of git://github.com/rwijaya/moodle

commit 3c2ed6ebabe8bc5f759ac6db26b9cbb99cb476ff
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 26 Jul 2012 14:11:57 +0800
Tag:    v2.4.0-beta

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

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 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 33405ffbd0a3216d2c68a1f270bd1d1e2cbe069e
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 26 Jul 2012 13:59:33 +0800
Tag:    v2.3.2

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit 821fbfe4f5155d2fa0e0d45f40f37a1445527509
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 24 Jul 2012 16:57:58 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-mdl-31294' of git://github.com/rajeshtaneja/moodle

commit 34cdc31ec83ad8d783ea2a28524bdaae8d0453cd
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 24 Jul 2012 16:40:42 +0800
Tag:    v2.3.2

Merge branch 'MDL-26969_m23' of git://github.com/rwijaya/moodle into MOODLE_23_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 c5e518d52176f8c7a637172e081bf31b28520e46
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 24 Jul 2012 16:39:59 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-26969' of git://github.com/rwijaya/moodle

commit acb88dbed3c5e682841f6249e676b35a7e5aeb38
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 24 Jul 2012 12:14:17 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-mdl-32942' of git://github.com/rajeshtaneja/moodle

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 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 f36b0ba5029dd79421cc0c763bbb1116ae1cdb20
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 23 Jul 2012 17:22:14 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-34285-m24' of git://github.com/samhemelryk/moodle

commit 8e711c3af0ec27bb8de701e883965b82ff6c4571
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 23 Jul 2012 16:40:11 +0800
Tag:    v2.3.2

Merge branch 'w30_MDL-34449_m23_layoutmaddness' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit ad1097c2d6f8e944d8240cb4485844ae8803cc2a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 23 Jul 2012 16:27:15 +0800
Tag:    v2.4.0-beta

Merge branch 'w30_MDL-34449_m24_layoutmaddness' of git://github.com/skodak/moodle

commit c1cf921653a5da76d14e38b3cce6f0dd4c4afec8
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 23 Jul 2012 16:09:44 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-29271-master' of git://github.com/FMCorz/moodle

commit 249996281a1f0721a2a436afcacfdf6bb660cde0
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 23 Jul 2012 15:32:32 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34400-master' of git://github.com/FMCorz/moodle

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 3e7788eebe01d570a87fdeddb4cda1d15be27d33
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 23 Jul 2012 10:21:44 +0800
Tag:    v2.3.2

Merge branch 'MDL-32665_chat_popup_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit d829f5c6fdf8cda4b6fa3021583710a20fb4bedc
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 23 Jul 2012 10:17:55 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-32665_chat_popup' of git://github.com/andyjdavis/moodle

commit 816ac8dfb51608b269b21575972b6dbb3699b91e
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 17 Jul 2012 17:22:48 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33767-master' of git://github.com/FMCorz/moodle

commit f5fee1e148a2f436dabf1518cc4d66e87836fc47
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 25 Jun 2012 16:45:23 +0800
Tag:    v2.3.0

Merge branch 'MDL-33694' of git://github.com/danpoltawski/moodle

commit 224d186ebbd991d9e019adf0741e3a34f6bd18ef
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 25 Jun 2012 14:30:18 +0800
Tag:    v2.3.0

Merge branch 'wip-MDL-33419-master' of https://github.com/barbararamiro/moodle

commit 7cacb2ef085d6fd74ddd6106b6e74a799631d6b4
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 21 Jun 2012 17:34:57 +0800
Tag:    v2.3.0-rc1

Merge branch 'wip-MDL-33297-master' of git://github.com/abgreeve/moodle

commit c575842ce93cfdd0fc19e6832cb060b322fef224
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 20 Jun 2012 19:36:22 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33683-master-2' of git://git.luns.net.uk/moodle

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 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 4c7d9eb5c2f248467368a948ae3a41e52c9ae7e6
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 20 Jun 2012 17:18:00 +0800
Tag:    v2.3.0-rc1

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

commit 01158d86c4b85c3a543b44f75fa3d8e54c0d0392
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 20 Jun 2012 16:57:51 +0800
Tag:    v2.3.0-rc1

Merge branch 'wip-MDL-33715-m23' of git://github.com/samhemelryk/moodle

commit c94972381759fd45f7a637b2ac8f8f8a2be92129
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 20 Jun 2012 16:50:54 +0800
Tag:    v2.3.0-rc1

Merge branch 'wip-MDL-33825-m23' of git://github.com/samhemelryk/moodle

commit 3262f547fc068aed69e6eb32eddd7891f97a9f92
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 20 Jun 2012 15:19:18 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33649-master-2' of git://git.luns.net.uk/moodle

commit cd29a5822fbcc081d7bf4a54aa1214d7d9f89e45
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 20 Jun 2012 14:53:20 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33722-master-wip' of git://git.luns.net.uk/moodle

commit 7189225b7a6a6f84368e4697a83c3bb299e449d8
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 20 Jun 2012 14:49:16 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33728-master-1' of git://git.luns.net.uk/moodle

commit f65d3d1d1871b8f873da4c5b7e1bbe9066b79860
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 20 Jun 2012 14:39:58 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33703-master-3' of git://git.luns.net.uk/moodle

commit eca0371465eca3b4d0fc19c10ca801805df94817
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 20 Jun 2012 14:28:05 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33729-master-1' of git://git.luns.net.uk/moodle

commit 23099d5beb0bf60c0fe8b374a10ddeecd3461d15
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 20 Jun 2012 12:11:07 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33357-3' of git://github.com/epsd/moodle

commit e77fe8f02080c3aba7be912498252ea720a379a1
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 20 Jun 2012 11:00:38 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33856-master-1' of git://git.luns.net.uk/moodle

commit 9e4d54e15d0ced74f5ae246d1b7401b559479ee6
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 19 Jun 2012 16:09:43 +0800
Tag:    v2.3.0-rc1

Merge branch 'wip-MDL-33130-master' of https://github.com/barbararamiro/moodle

commit 1ee9b37880e1b23dbad15c53a661c040846c411b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 19 Jun 2012 14:59:48 +0800
Tag:    v2.3.0-rc1

Merge branch 'wip-MDL-32990-master' of git://github.com/phalacee/moodle

commit 44b836d629466bdd5fcef295a34da73f700cccba
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 18 Jun 2012 17:14:11 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33175' of git://github.com/danpoltawski/moodle

commit 341d989d636e96a3bf566748bed0ce350eb18c93
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 18 Jun 2012 16:03:08 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30337_no_risk' of git://github.com/nebgor/moodle

commit 951f9829c0a2b0a1da0e4d50c0b5b7c647cd662c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 15 Jun 2012 16:26:56 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33769-master-1' of git://git.luns.net.uk/moodle

commit a6c3aed35d4f3c33f4fb0bead52ffa0d71dbb3bb
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 15 Jun 2012 14:54:10 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33317-master' of git://github.com/FMCorz/moodle

commit 8db5df0c56ff833916129fbf9814f818f7604b70
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 14 Jun 2012 21:29:45 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33442-master-integration' of git://github.com/FMCorz/moodle

commit 6971dcf7ec927ae10cca171f9f2e421ddfdb302d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 14 Jun 2012 21:09:55 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-33596-m23' of git://github.com/samhemelryk/moodle

commit 60d3ff94db722dd026343a1305f21b39acf2e3d3
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 14 Jun 2012 17:08:18 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31499-master-iframe' of git://github.com/FMCorz/moodle

commit 039e1105099f08e795b3193f13c070ad7fc370c6
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 13 Jun 2012 01:59:33 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33610' of git://github.com/danpoltawski/moodle

commit fa4ae5ac9f6fb7ea81e6f9739fd0c3836d1c47e6
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 13 Jun 2012 01:46:17 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33593' of git://github.com/danpoltawski/moodle

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 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 7d22edb6b127dfa9c882ed1f2928c305fa4ead7c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 12 Jun 2012 11:25:17 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-33515' of git://github.com/danmarsden/moodle

commit 575776c1bd0a52e618bd99cf4499369606dd327d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 12 Jun 2012 11:09:51 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31863' of git://github.com/mouneyrac/moodle

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 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 42fd3961713306e773f5b80e14926cd6e91ac9f2
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 11 Jun 2012 13:55:20 +0800
Tag:    v2.3.0-beta

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

commit ac16f1451204739fb8d1df3b62931303c66304c8
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 07 Jun 2012 14:04:08 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33465-master' of git://github.com/ankitagarwal/moodle

commit 3872cae1eb6b9931b46d945015cdbbff720c6d17
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 07 Jun 2012 11:59:13 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31863' of git://github.com/nebgor/moodle

commit bfcf1a449c0eea7320e573a1f55b79e7b5667583
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 06 Jun 2012 11:07:08 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-33527-master' of git://github.com/phalacee/moodle

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 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 2330cf7af10545a8f5af0539eec511e5f5f90895
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 05 Jun 2012 15:15:26 +0800
Tag:    v2.3.0-beta

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

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 267080d4ea4cd8cc419838e7a4c88361f19858eb
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 31 May 2012 15:11:25 +0800
Tag:    v2.3.0-beta

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

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 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 ffbe29a6bd39e51b654def1715c8877df0331409
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 31 May 2012 14:15:19 +0800
Tag:    v2.3.0-beta

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

commit 1adb060a8725ecaadf8952eebb3e05c707dc7f6d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 30 May 2012 16:48:23 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32329-all-plugins-ok' of git://github.com/mudrd8mz/moodle

commit e4b5455738822144e61c783b6213ca80666c8c43
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 30 May 2012 15:18:59 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33184-master' of https://github.com/FMCorz/moodle

commit 380d472314b1e5fea28980fdcd8ff3b32cbe3d5c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 30 May 2012 14:22:34 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-27120' of git://github.com/rajeshtaneja/moodle

commit 7df02eacf7c442615a8822e2a556e77a9767cfca
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 29 May 2012 17:11:11 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32779' of git://github.com/danpoltawski/moodle

commit 4fe0673c487e9ed829d356ade399ed6c6ea233ee
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 29 May 2012 17:06:19 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33375' of git://github.com/danpoltawski/moodle

commit 5eb80ab73db14c9769b9c59ff9598e5fb1805caa
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 29 May 2012 16:43:39 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33382-cli-install' of git://github.com/mudrd8mz/moodle

commit 95a8956884ac4f8aa61dce466133265ec5c3b9c9
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 29 May 2012 16:31:26 +0800
Tag:    v2.3.0-beta

Merge branch 'w22_MDL-33089_m23_phpunitrecover' of git://github.com/skodak/moodle

commit c70b7fd81fa8d40e453ad7f5fa1759df48ae549f
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 29 May 2012 10:26:21 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-27120' of git://github.com/rajeshtaneja/moodle

commit 66905a4cf761656fe710e797c2fb9bb80c319a1c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 25 May 2012 14:13:21 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33196' of git://github.com/rwijaya/moodle

commit b74ad708b120d1d95fcc08ffc4fa24e623f57b5c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 25 May 2012 12:08:03 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33307' of git://github.com/danpoltawski/moodle

commit 708738cd73c9835a4cd6d5b684e387741e1e5dc4
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 25 May 2012 11:25:25 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-33324-master' of git://github.com/marinaglancy/moodle

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 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 b9dade0c657464cc3ccd4e395ee696dd67db900f
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 24 May 2012 14:46:38 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-33318' of git://github.com/danmarsden/moodle

commit 04b66cb43c564812d626735bfbee53f2314cee9d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 23 May 2012 16:44:00 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-33143' of git://github.com/rajeshtaneja/moodle

commit ffa7d1cda07dce44a806fa7a42a7b20a6f5e4ec6
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 17 May 2012 17:17:37 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32087' of git://github.com/timhunt/moodle

commit 8280dec6faa78fa3355b2eb1c6da4e25b89ffcdf
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 17 May 2012 16:57:01 +0800
Tag:    v2.3.0-beta

Merge branch 'w20_MDL-33016_m23_hubperf' of git://github.com/skodak/moodle

commit defd2dcc13bad5806b129edfff526bb185b42ce5
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 17 May 2012 16:48:07 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-32866' of git://github.com/rajeshtaneja/moodle

commit 7ded1e29f95a504a7d5c41b44a82003657bd7fc7
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 17 May 2012 14:47:44 +0800
Tag:    v2.3.0-beta

Merge branch 'w20_MDL-32907_m23_like' of git://github.com/skodak/moodle

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 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 485e67982ca1c3f8459c4c189ebfef7560f76ebd
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 16 May 2012 15:59:07 +0800
Tag:    v2.3.0-beta

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

commit 9e66e960494e99c23d116488d355d9fe59dcd572
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 16 May 2012 14:32:51 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31657' of git://github.com/scriby/moodle

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 7585ac89bd494e7d9e3f2db57eb3a2211870f222
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 16 May 2012 14:03:56 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32988-master' of git://github.com/sammarshallou/moodle

commit 184287f0cee851e0f5c57ca05b6983771ed8e5ed
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 16 May 2012 13:48:42 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32921' of git://github.com/scriby/moodle

commit e7ebfb8058705fc40b8ff205256697f2abebf8c3
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 16 May 2012 10:39:48 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32005-master-10' of git://git.luns.net.uk/moodle

commit 154128a50f9cbbdc4539aa7f126f0d0b09f30f48
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 15 May 2012 16:41:54 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-32770' of git://github.com/rajeshtaneja/moodle

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 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 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 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 c459e91789ca94c56d40e57cc09259678f921cc8
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 15 May 2012 11:03:07 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-25695-master' of https://github.com/mackensen/moodle

commit ddd492ad7fad4272cdfd69371255a081fcb534fa
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 11 May 2012 12:40:38 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32707-master-1' of git://git.luns.net.uk/moodle

commit 1c7eb3df38954a9ef4e6f91a40e0c5188861b83a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 10 May 2012 16:54:35 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31133-master' of git://github.com/ankitagarwal/moodle

commit e1e3fa217fd702d4fb8f333bda181238c5e34b74
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 10 May 2012 10:52:32 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29624-master' of git://github.com/sammarshallou/moodle

commit b21a1d4086409144377462bbf2c35b360df1c8d6
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 03 May 2012 11:33:55 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-32416-master' of git://github.com/marinaglancy/moodle

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 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 648baa788c356e0604ac69031b5d288c7a2df57c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 02 May 2012 13:55:39 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-28657-master' of https://github.com/mackensen/moodle

commit 3c666bb0cfc2c134c812997faf0031e5d3296772
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 05 Apr 2012 16:20:13 +0800
Tag:    v2.0.9

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_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 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 69b101f8119bf4c5dc7b3c66460e95fcf28601d4
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 05 Apr 2012 16:19:27 +0800
Tag:    v2.3.0-beta

Merge branch 'install_master' of git://github.com/amosbot/moodle

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 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 5661f7b454e9e54677c0b33b5fec4e3bfb967a5d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 04 Apr 2012 13:40:58 +0800
Tag:    v2.3.0-beta

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

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 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 c82745d016267edfccc1a0ea6a391a4fbaa751a0
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 03 Apr 2012 17:00:47 +0800
Tag:    v2.3.0-beta

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

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 82d5042a73a5895d92c077bfc766e71acca99224
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 03 Apr 2012 16:31:53 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-31789-master' of git://github.com/marinaglancy/moodle

commit 9cafd9c6e0a2439c65dd0be6400aee458b31ddfa
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 03 Apr 2012 16:08:18 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-32081-m23' of git://github.com/samhemelryk/moodle

commit 91596e221108c14691c12ebd27f14c42073bd5fe
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 03 Apr 2012 15:55:12 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31867-master' of git://github.com/ankitagarwal/moodle

commit 31b6200263d0ecec9842491dd6acf620f61ae033
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 03 Apr 2012 14:58:27 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-17327-master' of git://github.com/abgreeve/moodle

commit bc706271c86256dfeb9f21442d04eb159132c6af
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 03 Apr 2012 11:42:58 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-32171-master' of git://github.com/marinaglancy/moodle

commit cc6c84373a91f1cdb08fabe032d4c1c1a7ad6f8c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 03 Apr 2012 10:18:19 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-32269-master' of git://github.com/marinaglancy/moodle

commit c2bc04233028537bc4408670fb1d544d36668c0a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 27 Mar 2012 13:22:01 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-31654' of git://github.com/rajeshtaneja/moodle

commit 5eee9f7aded0eadfd032c2b0befb7740f081bd2c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 27 Mar 2012 10:15:18 +0800
Tag:    v2.3.0-beta

Merge branch 'w13_MDL-32109_m23_fastpurify' of git://github.com/skodak/moodle

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 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 f3810b2ee2f09a4e5952f5043d2ad9ae46ae339b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 27 Mar 2012 10:10:05 +0800
Tag:    v2.3.0-beta

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

commit 1cc4412c89817e1d0b66d2e706ac1385e2bc6c78
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 27 Mar 2012 09:58:44 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31869_message_search_roles' of git://github.com/andyjdavis/moodle

commit 5599f2062c7544ffe744d21523242ec3afdbdd54
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 21 Mar 2012 10:50:51 +0800
Tag:    v2.3.0-beta

Merge branch git://github.com/phalacee/moodle.git wip-MDL-30482-master  - resolved conflicts  - fixed up tab --> spaces

commit d7de3f26828f8aa36bb331f43e44ed92149f9b65
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 21 Mar 2012 10:02:18 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-17327-master-v2' of git://github.com/abgreeve/moodle

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 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 aa4edcf614c6458cc45730f9a5d8eeeeed356b5a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 20 Mar 2012 16:06:40 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29848-master' of https://github.com/mackensen/moodle

commit 7d2b2e808fc24eba3f253a5eb46930a07082fac4
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 20 Mar 2012 13:20:03 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31818_grader_paging' of git://github.com/andyjdavis/moodle

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 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 b36135b66a35c17291885ea65994f3fbe2f06cc1
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 20 Mar 2012 10:09:43 +0800
Tag:    v2.3.0-beta

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

commit 12b899574951ab711c3fd7280ea6cb257c2be199
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 14 Mar 2012 09:16:27 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31853_admin_externalpage_setup' of git://github.com/davosmith/moodle

commit fed36d5077393de94549640c912815540b24ec07
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Mar 2012 16:54:08 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31709_message_get_participants' of git://github.com/andyjdavis/moodle

commit 66da1ab0ce5f3ffc586ad742e2d1ec0b4e0208ab
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Mar 2012 16:10:19 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-31838-master' of git://github.com/marinaglancy/moodle

commit 42c8e4d66df980fda9ff45db62187a9a0ae9942b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Mar 2012 15:51:53 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-31942' of git://github.com/danmarsden/moodle

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 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 387fb66fd90f70e551af0a29aa4531687ec99557
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Mar 2012 15:16:30 +0800
Tag:    v2.3.0-beta

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

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 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 c20cb1bab17bd3af8b05e5b7f572e6f95ff69e12
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Mar 2012 11:45:28 +0800
Tag:    v2.3.0-beta

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

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 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 f3c5d3102dda668d20be65a774de6f7293165305
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Mar 2012 11:26:42 +0800
Tag:    v2.3.0-beta

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

commit e281281b84a9f585912713c4d3d4ffa3490666c8
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Mar 2012 10:00:33 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31935_search_restore_link' of git://github.com/davosmith/moodle

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 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 ecb4c3f0ed8cb54a3026b957a4655df558b034e3
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Feb 2012 16:40:44 +0800
Tag:    v2.3.0-beta

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

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 e2afa730f620bca163824ccc28d457afb62c487a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Feb 2012 16:22:19 +0800
Tag:    v2.3.0-beta

Merge branch 'm_MDL-31419_fix_auth_typo' of git://github.com/gerrywastaken/moodle

commit b7c7260e44f2ad51116ed48b22ca33fe3f02b677
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Feb 2012 15:45:55 +0800
Tag:    v2.0.8

Merge branch 'MDL-30878-MOODLE_20_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_20_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 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 092d444dfbf2a0b6d7e47f5307adda144351317c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Feb 2012 15:35:45 +0800
Tag:    v2.3.0-beta

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

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 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 56658249c6553a61096a9520144da2464689ef73
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Feb 2012 14:41:48 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-28386-master' of git://github.com/ankitagarwal/moodle

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 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 20a903c34fd83f1a2398c465bea302e4ab3255b6
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Feb 2012 14:15:28 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31335_mtrace_email' of git://github.com/andyjdavis/moodle

commit dcfd468dff0a6252a5875de050afebbf8328efc5
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Feb 2012 14:12:26 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31739_forum_docblock' of git://github.com/andyjdavis/moodle

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 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 2ac18d92617e6a156799ab08ef2fd5a9b6731a35
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Feb 2012 13:48:34 +0800
Tag:    v2.3.0-beta

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

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 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 0f0eca4299a1ab8c4675435a60c6fb1f545da6f1
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Feb 2012 12:04:47 +0800
Tag:    v2.3.0-beta

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

commit 9906cf41ab56cf1b5835e19bf13f2da0076151bd
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 15 Feb 2012 11:32:32 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31114_dnd_ui_improvements' of https://github.com/davosmith/moodle

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 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 aad69d8b1aef93cbee36a7448a36f0c310cc2c2f
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 14 Feb 2012 15:38:43 +0800
Tag:    v2.3.0-beta

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

commit 21a7f3d27a6a91da9bb1626c3ab05c825a0e200f
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 14 Feb 2012 14:47:23 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31321_dndupload_multiple_elements' of https://github.com/davosmith/moodle

commit 9e31e848da9eb9925064dd74b8bb22fad338e843
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 14 Feb 2012 13:30:11 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31541_multiple_repository_instances' of git://github.com/davosmith/moodle

commit 2114555ced80b4c8eb6483fad48b1bcac56662cb
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 14 Feb 2012 11:56:25 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31495-master' of git://github.com/micaherne/moodle

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 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 cfb35d826cd4c0979272645fed451cbcf74513d7
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 14 Feb 2012 11:36:53 +0800
Tag:    v2.3.0-beta

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

commit a49d83ba4e4f225ebdc0956dca73a482d3f9e891
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 14 Feb 2012 11:28:37 +0800
Tag:    v2.3.0-beta

Merge branch 'm_MDL-30971_adding_tag_api_phpdocs_2' of git://github.com/gerrywastaken/moodle

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 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 d749f1dd5005ec8548a84917a2b339aeb95cc133
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 09 Feb 2012 09:43:54 +0800
Tag:    v2.3.0-beta

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

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 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 90c34a1b3c61fa5aed017b8d41eba9a431bb0db4
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 08 Feb 2012 11:25:44 +0800
Tag:    v2.3.0-beta

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

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 50ea492bc52f7859d5e8d56e58f945059b5339da
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 08 Feb 2012 10:12:20 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-31461' of git://github.com/danmarsden/moodle

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 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 1dd9848042b0b746c6f4cbf0d7229b9d54a950db
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 08 Feb 2012 09:57:55 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31482-master' of git://github.com/sammarshallou/moodle

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 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 d2fea8521980dff70eb74642e526a24fb87f081c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 07 Feb 2012 15:11:43 +0800
Tag:    v2.3.0-beta

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

commit 74bad523ff6a9846432fda89ef67a433ee3da3b4
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 07 Feb 2012 15:02:32 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31445' of git://github.com/timhunt/moodle

commit 74126453c51898081f5eced4c34a3abbfb88604a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 07 Feb 2012 14:10:26 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31491_master' of git://github.com/kordan/moodle

commit b0ce209054f921195caaa9927946e8695f8c0bd1
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 02 Feb 2012 11:22:58 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-31360' of git://github.com/danmarsden/moodle

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 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 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 d7da31228e885180bcc866e87ebf6f1faac4993e
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 31 Jan 2012 16:48:59 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30828_feedback_sort' of git://github.com/andyjdavis/moodle

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 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 42edf34d43285f2ba9bac5417996429c53756952
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 31 Jan 2012 16:43:28 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30707_forum_log' of git://github.com/andyjdavis/moodle

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 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 df71b4d72fe010e302166fe6b56aa2bc9e75a1da
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 31 Jan 2012 14:21:14 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29097_mod_update_create' of git://github.com/andyjdavis/moodle

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 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 640d4d956360db391d8d04d15ebfca76a7c77643
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 31 Jan 2012 11:51:14 +0800
Tag:    v2.3.0-beta

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

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 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 634269614035cd48cf7e5007cbce06c4e0ae4bed
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 31 Jan 2012 11:15:26 +0800
Tag:    v2.3.0-beta

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

commit 2b19ed89450c9ce09b67d22b93712c1d2fd0e8e2
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 30 Jan 2012 16:33:09 +0800
Tag:    v2.0.8

Merge branch 'MDL-26260_20' of git://github.com/timhunt/moodle into MOODLE_20_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 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 1fac0355037a79f349a14b4231f601cfa2c7312a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 30 Jan 2012 16:23:54 +0800
Tag:    v2.3.0-beta

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

commit 627618e1409316a44806803b2f43f1ea9ffa5cb4
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 30 Jan 2012 15:52:50 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31311-Fix_iframe_titles' of git://github.com/ncsu-delta/moodle

commit 44983c3f3dce285fa43271138e0cc8abd958e63f
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 30 Jan 2012 15:01:53 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31319' of git://github.com/mackensen/moodle

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 fd174542e3f17da2dadf93e0186a51dfd45c6c59
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 30 Jan 2012 14:24:31 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31392' of git://github.com/timhunt/moodle

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

Merge branch 'MDL-31385_20' of git://github.com/timhunt/moodle into MOODLE_20_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 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 f37b3defb187774b1d29553331765495870ecb7a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 24 Jan 2012 22:57:24 +0800
Tag:    v2.3.0-beta

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

commit 3dd00d7030046763bbfd7a11d69bceceb8135914
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 24 Jan 2012 20:23:05 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-29941-master' of git://github.com/samhemelryk/moodle

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 9c690979c2319453311c97ff83d79d6b99c73f8e
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 24 Jan 2012 07:15:15 +0800
Tag:    v2.3.0-beta

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

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 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 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 5b80391fde91611e3f322c7dcf6c0af3d277fa9d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 24 Jan 2012 06:57:57 +0800
Tag:    v2.3.0-beta

Merge branch 'w04_MDL-31184_m23_glosreset' of git://github.com/skodak/moodle

commit c8be518100f52bb4809030657d8433a6151e1028
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 16 Jan 2012 16:15:04 +0800
Tag:    v2.3.0-beta

Merge branch 'w03_MDL-30929_m23_stalefiles' of https://github.com/skodak/moodle

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 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 025ce406e73359597fd6538831692d8ba27a7d72
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 16 Jan 2012 15:29:05 +0800
Tag:    v2.3.0-beta

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

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 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 920871431563dbc5a76e20d926529e462cbf23ee
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 16 Jan 2012 14:52:23 +0800
Tag:    v2.3.0-beta

Merge branch 'w03_MDL-31166_m23_clipath' of https://github.com/skodak/moodle

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 cd70d3c4a8d0491a8ec410ea5e277254db4bea20
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 16 Jan 2012 14:46:39 +0800
Tag:    v2.3.0-beta

Merge branch 'w03_MDL-21992_m23_customscripts' of https://github.com/skodak/moodle

commit 9e328348276d91fcae8ea702eee12c9cfdfaeed6
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 16 Jan 2012 14:40:46 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-31025-m23' of https://github.com/samhemelryk/moodle

commit 8e9e623e79dca4d85c9ca856d9e1de5aaaf2a331
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 16 Jan 2012 13:38:49 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-3054' of git://github.com/mackensen/moodle

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 7ed8dc999f53ec1dadb29870c43056b84626ae9d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 16 Jan 2012 11:39:05 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-31072-master' of github.com:marinaglancy/moodle

commit 89aac2b3cd1654a69739c14c5fb31fd44315e7b1
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 16 Jan 2012 10:14:23 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-30578' of git://github.com/mayankgupta/moodle

commit bb9546d0c7b7978007be8b5057569584ef8b0a49
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 09 Jan 2012 13:44:36 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-30583-master' of git://github.com/samhemelryk/moodle

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 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 fcad996aabf6bbfc31a7507903e2c9db88c4086c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 09 Jan 2012 12:18:36 +0800
Tag:    v2.3.0-beta

Merge branch 'w02_MDL-30718_m23_usertimedb' of git://github.com/skodak/moodle

commit 15624257cb0020ece67f2d33fae2ff4416d2ca1a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 04 Jan 2012 10:11:20 +0800
Tag:    v1.9.16

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

commit 2482570b9f4f7e847cf86c11d2968d72272dad69
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 03 Jan 2012 17:54:14 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30600b' of git://github.com/rwijaya/moodle

commit 9238b568c52bf81e7c8e75210f863fb87245e756
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 03 Jan 2012 12:33:02 +0800
Tag:    v2.0.7

Merge branch 'wip-mdl-29844-m20' of git://github.com/rajeshtaneja/moodle into MOODLE_20_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 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 d7ca9b68cad454f8bd83057efe0e4d2190323328
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 03 Jan 2012 12:29:12 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-29844' of git://github.com/rajeshtaneja/moodle.git - resolved conflict

commit b23d738cde3b43e2f22e1b1d2528d5a486a86563
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 21 Dec 2011 14:19:22 +0800
Tag:    v2.0.7

Merge branch 'wip-MDL-30541-stable20' of git://github.com/phalacee/moodle into MOODLE_20_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 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 c42346aa63b82eeb8293ddb8785d3b9efcceb955
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 21 Dec 2011 14:15:54 +0800
Tag:    v2.3.0-beta

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

commit b562573aa2780a42a718e29f4cb5d3b4c1e49ff0
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 21 Dec 2011 13:36:14 +0800
Tag:    v2.0.7

Merge branch 'wip-MDL-30539-stable20' of git://github.com/phalacee/moodle into MOODLE_20_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 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 3f14cf7f4e9c51b6c791de6bb9d740b0bd43aacb
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 21 Dec 2011 11:20:50 +0800
Tag:    v2.3.0-beta

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 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 8f43b3990d16aff925b0b51b3e519a2a21a3e089
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 20 Dec 2011 15:52:38 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-25561_user_report_name_clickable' of git://github.com/andyjdavis/moodle

commit 50c59551c679862a369621490aa0948311cf3af2
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 20 Dec 2011 13:38:21 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30627-master-1' of git://git.luns.net.uk/moodle

commit 21be45b46da9dd0b04262159f3a28bdafc4238ce
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 20 Dec 2011 11:54:23 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30641-master-1' of git://git.luns.net.uk/moodle

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 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 74f0b722545b508a1d3a33f85ddce2b3ef812783
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 20 Dec 2011 11:08:42 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30569-master' of git://github.com/ankitagarwal/moodle

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 26b85f89bc3696426b2d2e42e76a658930482264
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 19 Dec 2011 11:52:33 +0800
Tag:    v2.3.0-beta

Merge branch 'w51_MDL-30735_m23_cron' of git://github.com/skodak/moodle

commit 441088d647eb52e305e8e8d9fc9d38bbbde98b3f
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 16 Dec 2011 11:36:47 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-28728' of git://github.com/danmarsden/moodle

commit 2faa009fa17d09b3570621636b3dc5b4037a03a0
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 14 Dec 2011 13:35:38 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-28728' of git://github.com/danmarsden/moodle

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 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 0ef92d976c6e8d00506b63e6df5f180d5cbec910
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Dec 2011 16:51:23 +0800
Tag:    v2.3.0-beta

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

commit d919bd00b37aaf433452317e87a80adca8bbc40b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Dec 2011 14:59:22 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-29325' of git://github.com/danmarsden/moodle

commit 981661f7454626dda9449c3c727381a667530f02
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Dec 2011 14:45:35 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-30577' of git://github.com/mayankgupta/moodle

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 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 c35d38161e2f405147b93faf88fa5bb9bd6ed2c3
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Dec 2011 14:34:42 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30472-master' of git://github.com/ankitagarwal/moodle

commit 036e9c7cbf236a502bb5215caed21ea8e0c2bd5e
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Dec 2011 14:29:25 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30362-master-1' of git://git.luns.net.uk/moodle

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 1ff57577da274edf9733364249a2813d32d9650a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Dec 2011 13:48:43 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30562' of git://github.com/timhunt/moodle

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 c4378f125bcc8418843353bb9e27b531293730ef
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Dec 2011 13:20:21 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30655-master' of git://github.com/sammarshallou/moodle

commit 9b91efe5bcfebb0d399c7b5f1851b562b473cab4
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Dec 2011 12:02:05 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30559' of git://github.com/timhunt/moodle

commit 099f23b7d77f2b4660b01c7e5ce6bfa205d41597
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Dec 2011 11:11:47 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-30482-master' of git://github.com/phalacee/moodle

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 c45c1e1f207c88403433c50d7c9a084bcdf57b62
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 12 Dec 2011 14:36:59 +0800
Tag:    v2.3.0-beta

Merge branch 'w51_MDL-30613_m23_FULLME' of git://github.com/skodak/moodle

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 70a7b8e1cd2b3774276ef9d12b21cbe4cdd86b36
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 09 Dec 2011 11:07:20 +0800
Tag:    v2.3.0-beta

Merge branch 'w50_MDL-27364_m23_recaptchahttps' of git://github.com/skodak/moodle

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 29459d8e15828c5944487aa04279239d1f5aae3d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 09 Dec 2011 10:46:23 +0800
Tag:    v2.3.0-beta

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

commit 4000fce1a3a0133a582e6c6e037e17f59db9140a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 09 Dec 2011 10:19:22 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-26974' of git://github.com/danmarsden/moodle

commit ce78f1d6f5792c8422f9d53385d2181bb672de2f
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 09 Dec 2011 10:13:22 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-30579' of git://github.com/mayankgupta/moodle

commit 1f8c6a9012dc4c3ee652153c42a26245941d38cf
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 08 Dec 2011 17:00:37 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-30028' of git://github.com/danmarsden/moodle

commit f844dbcacee45866faf658ae9b6a289a0bdbe04b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 08 Dec 2011 16:24:00 +0800
Tag:    v1.9.16

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

commit ff6a1ffdbea8421864cbde80afac0534b7c32e06
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 08 Dec 2011 16:22:22 +0800
Tag:    v2.0.7

Merge branch 'wip-MDL-30336-MOODLE_20_STABLE' of git://github.com/abgreeve/moodle into MOODLE_20_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 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 80923958d19235c98c5a72c85efca8a294c80588
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 08 Dec 2011 16:04:30 +0800
Tag:    v2.3.0-beta

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

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 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 5ac06899c7de011f7a09fd8217ed431fd65a93df
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 08 Dec 2011 15:51:27 +0800
Tag:    v2.3.0-beta

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

commit cc4d45b91653ac5dcc7195926ddac340dffff7bf
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 08 Dec 2011 14:46:40 +0800
Tag:    v1.9.16

Merge branch 'wip-MDL-30012-m19' of git://github.com/samhemelryk/moodle into MOODLE_19_STABLE

commit cd8805448d776dba1af2ad2739c172118459d353
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 08 Dec 2011 14:19:46 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30350-master-1' of git://git.luns.net.uk/moodle

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 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 357317fb6e3cf33a49eec8168700178da1754983
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 08 Dec 2011 13:56:51 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-27432_gd_error' of git://github.com/andyjdavis/moodle

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 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 983fb3f4aa99a22e5aca94582fd268e8bb4d7399
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 08 Dec 2011 13:43:55 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-28710_rating_classes' of git://github.com/andyjdavis/moodle

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 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 a92365080d460b957b7398cb50af64c19c487944
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 08 Dec 2011 13:38:54 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30607_override_email' of git://github.com/andyjdavis/moodle

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 5738c51982170ebc819183b5e5a1864b191fa73b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 01 Dec 2011 11:28:30 +0800
Tag:    v2.0.7

Merge branch 'MDL-30260_backport_20' of git://github.com/andyjdavis/moodle into MOODLE_20_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 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 fd5cee8ce9cc776b7434842416106e242f99174b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 30 Nov 2011 15:19:06 +0800
Tag:    v2.0.7

Merge branch 'wip-MDL-27334-MOODLE_20_STABLE' of git://github.com/abgreeve/moodle into MOODLE_20_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 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 a0380d65e93a4fa51bb5e1624a954ee3c3232801
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 30 Nov 2011 14:43:37 +0800
Tag:    v2.0.7

Merge branch 'wip-MDL-29469-stable20' of git://github.com/phalacee/moodle into MOODLE_20_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 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 cf1fa9497d42bc315c45608e641ecc901b69534e
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 30 Nov 2011 14:13:27 +0800
Tag:    v2.0.7

Merge branch 'MDL-30395-MOODLE_20_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_20_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 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 487b07bcc14fc2a8ffaf029af38326bb0fd2fb70
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 28 Nov 2011 11:49:59 +0800
Tag:    v2.0.7

Merge branch 'MDL-30460-m20' of git://github.com/ankitagarwal/moodle into MOODLE_20_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 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 4e3676afefbcdf9dcfdde1c2c41b626cb5f9b154
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 24 Nov 2011 16:15:04 +0800
Tag:    v2.0.6

Merge branch 'MDL-30288_override_checkbox_20' of git://github.com/andyjdavis/moodle into MOODLE_20_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 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 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 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 1fee8759bc6a03c6699bf24335f9d1510fd0ebfc
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 23 Nov 2011 11:14:47 +0800
Tag:    v2.0.6

Merge branch 'wip-MDL-20627-MOODLE_20_STABLE' of git://github.com/abgreeve/moodle into MOODLE_20_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 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 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 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 d31ebf34620faf52c798ba74785dd0c5fa6b268b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Nov 2011 16:19:48 +0800
Tag:    v2.0.6

Merge branch 'MDL-30194-m20' of git://github.com/phalacee/moodle into MOODLE_20_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 31550708b462f5debbb81add1b48bf39431edf4d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Nov 2011 16:11:06 +0800
Tag:    v2.0.6

Merge branch 'wip-mdl-29396-m20' of git://github.com/rajeshtaneja/moodle into MOODLE_20_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 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 f50e703e21ee9edabfbf2ee0880b1095f92540d7
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Nov 2011 14:25:28 +0800
Tag:    v2.0.6

Merge branch 'MDL-27703_user_report_sql_20' of git://github.com/andyjdavis/moodle into MOODLE_20_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 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 e239fd37b8f7004ca9fe26d1ffbe64bb9bace7c3
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Nov 2011 01:22:20 +0800
Tag:    v2.0.6

Merge branch 'MDL-29814_blank_emails2_20' of git://github.com/andyjdavis/moodle into MOODLE_20_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 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 6c5fe9f7e9ee018d3e7f0253c1e7974a9468915e
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 21 Nov 2011 14:10:07 +0800
Tag:    v2.0.6

Merge branch 'wip-MDL-30289-MOODLE_20_STABLE' of git://github.com/abgreeve/moodle into MOODLE_20_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 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 36d22219bc7e7186070e927a69ecc00333be4008
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 21 Nov 2011 11:53:21 +0800
Tag:    v2.0.6

Merge branch 'MDL-30279-m20' of git://github.com/ankitagarwal/moodle into MOODLE_20_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 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 eff6d318ffe34876f0cf95d89c068ffb3518b187
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 11 Nov 2011 17:02:51 +0800
Tag:    v2.0.6

Merge branch 'wip-mdl-29638-m20' of git://github.com/rajeshtaneja/moodle into MOODLE_20_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 7ba8da8a13cfc8a3be733d2d8aeb54ef09aaa29c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 11 Nov 2011 13:14:52 +0800
Tag:    v2.0.6

Merge branch 'm20_MDL-27037_wiki_visiblegroups_functionality' of https://github.com/mayankgupta/moodle into MOODLE_20_STABLE

commit 4342686ce6cc99610885f2b278c8b21fb1f14b23
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 11 Nov 2011 11:27:01 +0800
Tag:    v2.0.6

Merge branch 'wip-MDL-26712-stable20' of git://github.com/phalacee/moodle into MOODLE_20_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 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 41752c58bc12661e9ca97615303174678a03fbf8
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 09 Nov 2011 17:55:28 +0800
Tag:    v2.0.6

Merge branch 'MDL-29620-workshop-sequence_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_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 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 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 bca9d87c4eb311929e3cc3b55342f38bab1f481c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 09 Nov 2011 13:38:07 +0800
Tag:    v2.0.6

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

commit 9d7e30f9b8c6bceb7f24ea1bedcbf008e1064ad1
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 09 Nov 2011 13:37:41 +0800
Tag:    v1.9.15

Merge branch 'MDL-29977-mnet-masquerade_19_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_19_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 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 8935486dc4f0734febf7e6450f2a54dd197df2a5
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 09 Nov 2011 11:05:15 +0800
Tag:    v2.0.6

Merge branch 'wip-MDL-24200-stable20' of git://github.com/phalacee/moodle into MOODLE_20_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 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 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 ce8e5673027bee05aadc94312bdb8bdfe310b5ac
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 08 Nov 2011 15:18:54 +0800
Tag:    v2.0.6

Merge branch 'wip-mdl-27521-stable20' of git://github.com/phalacee/moodle into MOODLE_20_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 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 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 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 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 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 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 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 3555da1d3c39db7954e1f49b207a7aeebb4ab485
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 08 Nov 2011 11:31:15 +0800
Tag:    v2.0.6

Merge branch 'MDL-30154_20_wip' of git://github.com/grabs/moodle into MOODLE_20_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 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 a4276fe09638e602d145976bc8f268b9fbb552ee
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 01 Nov 2011 15:28:25 +0800
Tag:    v2.0.6

Merge branch 'w43_MDL-30005_m20_uri' of git://github.com/skodak/moodle into MOODLE_20_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 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 d14031e9aef5be9a0d9999d8f18e0c7942c43aa8
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 01 Nov 2011 12:16:42 +0800
Tag:    v2.0.6

Merge branch 'w43_MDL-29990_m20_navcontinue' of git://github.com/skodak/moodle into MOODLE_20_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 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 ace896cda72a2ae65056eee5f3be0024396098b1
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 01 Nov 2011 12:07:57 +0800
Tag:    v2.0.6

Merge branch 'MDL-29787_M20' of git://github.com/lazydaisy/moodle into MOODLE_20_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 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 4b25984a20a24e8ded4d24d5aef8d47b024b8483
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 31 Oct 2011 16:06:03 +0800
Tag:    v2.0.6

Merge branch 'w43_MDL-29966_m20_grouploading' of git://github.com/skodak/moodle into MOODLE_20_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 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 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 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 44aba13a35b9de23d91c3ba8cba4747a7287320d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 31 Oct 2011 15:19:43 +0800
Tag:    v2.0.6

Merge branch 'MOODLE_20_STABLE' of git://git.moodle.org/integration into MOODLE_20_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 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 2db9576147bf14988adcfadb9cc18e60ed03f882
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 24 Oct 2011 17:05:49 +0800
Tag:    v2.0.6

Merge branch 'MDL-29542_m20' of git://github.com/rwijaya/moodle into MOODLE_20_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 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 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 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 1e898eefe343da24123fd0cba6165a2026ee456d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 24 Oct 2011 14:49:54 +0800
Tag:    v2.0.6

Merge branch 'MDL-29619-m20' of git://github.com/ankitagarwal/moodle into MOODLE_20_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 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 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 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 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 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 f36e320c7edc3ffef938a56f885774463986b5fa
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 11 Oct 2011 11:26:07 +0800
Tag:    v2.0.6

Merge branch 'wip-MDL-27278-m20' of git://github.com/samhemelryk/moodle into MOODLE_20_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 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 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 5775674f8c171b50f3509d9454b4a6623ca11af0
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 11 Oct 2011 09:28:02 +0800
Tag:    v2.0.6

Merge branch 'wip-MDL-28582-m20' of git://github.com/samhemelryk/moodle into MOODLE_20_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 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 422d1ed2746b2f97ae4383a5f1125fbedab8c059
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 10 Oct 2011 23:15:16 +0800
Tag:    v2.0.6

Merge branch 'wip-MDL-29224-m20' of git://github.com/samhemelryk/moodle into MOODLE_20_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 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 c868308b89a86449910c8b09be848cf510c9717f
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 10 Oct 2011 22:47:27 +0800
Tag:    v2.0.6

Merge branch 'wip-MDL-29672-m20' of git://github.com/samhemelryk/moodle into MOODLE_20_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 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 8e6e5adb5bcf3d3cfe54194ea0c3d0c5f0b05369
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 05 Oct 2011 14:54:31 +0800
Tag:    v2.0.5

Merge branch 'wip-MDL-28615-m20-squashed' of git://github.com/samhemelryk/moodle into MOODLE_20_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 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 e2c3a02bb818b8ae5056fc613641b95ce09eba7d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 03 Oct 2011 16:03:03 +0800
Tag:    v2.0.5

Merge branch 'MDL-26486_m20' of git://github.com/rwijaya/moodle into MOODLE_20_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 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 1f6a5026748926737ba2fb5fc995373879ff20a4
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 03 Oct 2011 14:31:44 +0800
Tag:    v2.0.5

Merge branch 'wip-MDL-27867-m20' of git://github.com/samhemelryk/moodle into MOODLE_20_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 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 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 4824e2deff4e2f801f303020860547e3058dbfaf
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 03 Oct 2011 13:52:52 +0800
Tag:    v2.0.5

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

commit 38be5071c845423ecee7b78e84ea22fed41b4e7a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 27 Sep 2011 15:01:45 +0800
Tag:    v2.0.5

Merge branch 'MDL-29230_m20' of git://github.com/rwijaya/moodle into MOODLE_20_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 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 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 041d4b3fab25d45e81f34f2b0ca4229621433b78
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 27 Sep 2011 11:27:26 +0800
Tag:    v2.0.5

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

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 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 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 30a7869e49957b8ac49c6c880590a0c828eb5f61
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 26 Sep 2011 16:01:47 +0800
Tag:    v2.0.5

Merge branch 'wip-MDL-29487-m20' of git://github.com/samhemelryk/moodle into MOODLE_20_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 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 f2b7714f6b7a491c36e14b80f5a03c64227f9d45
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 26 Sep 2011 14:50:09 +0800
Tag:    v2.0.5

Merge branch 'MDL-29464_20' of git://github.com/timhunt/moodle into MOODLE_20_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 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 d0830107cb6b6b2fec8ed9e5852a09d441f41260
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 26 Sep 2011 14:08:30 +0800
Tag:    v2.0.5

Merge branch 'MDL-29333_rating_ajax_20' of git://github.com/andyjdavis/moodle into MOODLE_20_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 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 5e90b425fb2df69df26d6e6ae31dc54e089afcc9
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 20 Sep 2011 13:18:24 +0800
Tag:    v2.0.5

Merge branch 'MDL-26890-m20' of git://github.com/ankitagarwal/moodle into MOODLE_20_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 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 3ee798f85f21f89177f4b63dfbe9082216c89a55
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 20 Sep 2011 10:21:45 +0800
Tag:    v2.0.5

Merge branch 'wip-mdl-28726-m20' of git://github.com/rajeshtaneja/moodle into MOODLE_20_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 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 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 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 3a5dd161c2262fefa9a59e0b0904685c8f4fbc48
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 19 Sep 2011 12:18:14 +0800
Tag:    v2.0.5

Merge branch 's13_MDL-28509_youtube_20' of github.com:dongsheng/moodle into MOODLE_20_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 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 e2ea315c5bb0a5e107614ad2ec4513212f756955
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Sep 2011 19:17:03 +0800
Tag:    v2.0.5

Merge branch 'MDL-26257-20' of git://github.com/bostelm/moodle into MOODLE_20_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 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 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 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 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 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 06a8b8482df4697137790c6cfffaf6d1b2b40b25
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Sep 2011 13:35:15 +0800
Tag:    v2.0.5

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

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 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 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 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 70e16becadeed2eff722a4e06cd7e9945c545f28
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 05 Sep 2011 13:22:25 +0800
Tag:    v2.0.5

Merge branch 'wip-MDL-26811-m20' of git://github.com/samhemelryk/moodle into MOODLE_20_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 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 146ada0aa6647e5e7770f300253e21f4044e18d4
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 05 Sep 2011 12:53:56 +0800
Tag:    v2.0.5

Merge branch 'MDL-29198_20' of git://github.com/stronk7/moodle into MOODLE_20_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 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 311c3e9365aa1a6828b190cfab0ec684736e9b92
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 30 Aug 2011 11:23:57 +0800
Tag:    v2.0.5

Merge branch 'MDL-29005_MOODLE_20_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_20_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 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 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 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 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 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 ce7519c27ea04727d2a6f9cb4c62d1e54514b742
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 24 Aug 2011 01:30:09 +0800
Tag:    v2.0.5

Merge branch 'MDL-28723-plugin-tables_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit d87ea7704dd754ef64bf4ee5e9b1050af064c569
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 24 Aug 2011 01:16:23 +0800
Tag:    v1.9.14

Merge branch 'MDL-28723-plugin-tables_19_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_19_STABLE

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 9ef338d744ad792de9cf5ba74719488484070626
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 23 Aug 2011 14:58:00 +0800
Tag:    v2.0.5

Merge branch 'MDL-28509_20_STABLE' of git://github.com/marxjohnson/moodle into MOODLE_20_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 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 5a80cab06dbc9dd4d4c4fa74685f9b26b34e9372
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 23 Aug 2011 01:54:22 +0800
Tag:    v2.0.5

Merge branch 'wip-mdl-28580-m20' of git://github.com/rajeshtaneja/moodle into MOODLE_20_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

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