Git merges in Moodle 2.2.0 by Aparup Banerjee

commit 9be14d29e43513b0a5afd72d634776f4dcd9532b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 01 Dec 2011 11:54:25 +0800
Tag:    v2.2.0-rc1

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

commit 0fa557d5fd400250b56d8fe314f8771ca58f7fc4
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 01 Dec 2011 11:24:47 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30260_disable_messages' of git://github.com/andyjdavis/moodle

commit 15cca3e470ad15c58580980f42202cc55ad52e86
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 30 Nov 2011 17:47:18 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30494_tokenize_test' of git://github.com/andyjdavis/moodle

commit e95a0cefda93f05967c11d8217e403450e179be7
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 30 Nov 2011 17:39:23 +0800
Tag:    v2.2.0-rc1

Merge branch 'w49_MDL-30517_m22_blockdelete' of git://github.com/skodak/moodle

commit 20ab954b3c599a2d5e1137495d619b2e3fdca95d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 30 Nov 2011 15:36:14 +0800
Tag:    v2.2.0-rc1

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

commit d423462e1cdfd5be9e586b9e93510aa4af6d8ce9
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 30 Nov 2011 15:01:25 +0800
Tag:    v2.2.0-rc1

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

commit 96b3002aae77c0252d855c89bca69ca36d68d30b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 30 Nov 2011 14:37:59 +0800
Tag:    v2.2.0-rc1

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

commit 2069c52e20fa35aec17fd27b4c5842b9cc3090e2
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 30 Nov 2011 14:04:14 +0800
Tag:    v2.2.0-rc1

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

commit 1b39425dae69077b85b36b9b6b5d2fc0d38d790e
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 29 Nov 2011 16:38:02 +0800
Tag:    v2.2.0-rc1

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

commit 67411c839952c109dc6551e52b3a36b29624f7cc
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 29 Nov 2011 11:27:53 +0800
Tag:    v2.2.0-rc1

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

commit 66b97716c54350c3d7be04b96df4d7b7806f5522
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 28 Nov 2011 17:02:26 +0800
Tag:    v2.2.0-rc1

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

commit 3625e9049f1cb1f2679044b4a9aa7b3672f70377
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 28 Nov 2011 15:21:34 +0800
Tag:    v2.2.0-rc1

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

commit 00347b3c3c437ca31b2c78216598d31de1df6ec0
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 28 Nov 2011 14:33:57 +0800
Tag:    v2.2.0-rc1

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

commit 86b3dd264e792f2c5fe693aea25d7a751d9a8017
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 28 Nov 2011 11:43:03 +0800
Tag:    v2.2.0-rc1

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

commit 98377ed578b003829fd7a1b5ff7d480ed1de569b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 25 Nov 2011 11:59:10 +0800
Tag:    v2.2.0-rc1

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

commit c47b8c7d0c074fe6a841b9bc62527fe54956fed8
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 24 Nov 2011 16:14:37 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30288_override_checkbox' of git://github.com/andyjdavis/moodle

commit 3ca3098f3103fdb059b741892040a35fad479630
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 24 Nov 2011 14:39:53 +0800
Tag:    v2.2.0-rc1

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

commit c32e3a0a0afa3a25d5a023ae6bfad8b447dc0703
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 23 Nov 2011 14:34:34 +0800
Tag:    v2.2.0-rc1

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

commit d7de1c8a6230ffacec6e40be808bf4630a55a122
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 23 Nov 2011 13:47:52 +0800
Tag:    v2.2.0-rc1

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

commit 4cff8cb5507bf3c9f806a149b4e4bb5f1fb7a598
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 23 Nov 2011 12:36:35 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-28562_wip' of https://github.com/jamiepratt/moodle

commit a9c56ad2dfb12b8f1ec579f32994ef32ded13588
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 23 Nov 2011 12:06:58 +0800
Tag:    v2.2.0-rc1

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

commit 5cde86faa931d88fa7ddd64b2b79f52b72ed87ab
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 23 Nov 2011 11:41:58 +0800
Tag:    v2.2.0-rc1

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

commit d2b5a2caf5aa65ffc2a99034250e664a0d5786bc
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 23 Nov 2011 11:12:03 +0800
Tag:    v2.2.0-rc1

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

commit e0e2db92a3a228d237dcc222f67f641351b39621
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Nov 2011 17:16:27 +0800
Tag:    v2.2.0-rc1

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

commit 65fbaea13dd4fe3b34c68472c1bf2d9f64118951
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Nov 2011 16:26:29 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30185' of git://github.com/colchambers/moodle

commit 525e45795a4483f330690cba8bdee6869cdb2759
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Nov 2011 16:08:57 +0800
Tag:    v2.2.0-rc1

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

commit 46fc365c7710f832e9959ac9a4631a20b072c4f7
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Nov 2011 15:28:17 +0800
Tag:    v2.2.0-rc1

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

commit 6aabd59e69e8843b3531c0ba9d62cbfbbb17d844
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Nov 2011 13:48:24 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-27703_user_report_sql' of git://github.com/andyjdavis/moodle

commit 3a9e6be55ad105ca81da635cd9a623c11e7e5994
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Nov 2011 11:33:55 +0800
Tag:    v2.2.0-rc1

Merge branch 'w46_MDL-30349_m22_filestatcaching' of git://github.com/skodak/moodle

commit 85227804b4b6e8b7a54a069083728a0bc86f4f77
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Nov 2011 01:15:26 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-29814_blank_emails2' of git://github.com/andyjdavis/moodle

commit 3a59d04c659a3157952d9e7adcc7f979f883f69f
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 21 Nov 2011 14:47:23 +0800
Tag:    v2.2.0-rc1

MDL-30268 Web service : resolved version number conflict

commit 9dc97097b1429a7e068b713d52ac1283a8cbd41e
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 21 Nov 2011 13:57:34 +0800
Tag:    v2.2.0-rc1

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

commit 338b9cab8382be7b126b6ec9946aa850f9316690
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 21 Nov 2011 11:28:27 +0800
Tag:    v2.2.0-rc1

Merge branch 'w46_MDL-21617_m22_xhack' of git://github.com/skodak/moodle

commit 8adce198e430ddc83503dc2666ed4d3ee356b2dd
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 18 Nov 2011 15:34:18 +0800
Tag:    v2.2.0-rc1

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

commit d48dae7507a572ceda79be39fb45de450662c68d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 11 Nov 2011 11:26:22 +0800
Tag:    v2.2.0-beta

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

commit b965ee236c2eadce27e40afbe85bad43ca9899f5
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 09 Nov 2011 17:55:04 +0800
Tag:    v2.2.0-beta

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

commit 024f0f7374b8774083b26ed5243422ad035dc21d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 09 Nov 2011 13:40:24 +0800
Tag:    v2.2.0-beta

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

commit 92f6c2eb7f51cde8c48cd06ba1bde7f394978957
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 09 Nov 2011 12:19:20 +0800
Tag:    v2.2.0-beta

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

commit 097ba12ba03c80c1d430c7a7993a76a2235e034a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 09 Nov 2011 11:29:45 +0800
Tag:    v2.2.0-beta

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

commit 5b653c75dde8362a55fd25cb4f79ec9a17a2cfbe
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 09 Nov 2011 11:05:32 +0800
Tag:    v2.2.0-beta

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

commit 98901d3ea9eb16e6c2e03111e2123979f334d2e1
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 08 Nov 2011 20:34:41 +0800
Tag:    v2.2.0-beta

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

commit 3c905de59d9f6a3a77f75f31271c2b8df02284cc
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 08 Nov 2011 16:48:59 +0800
Tag:    v2.2.0-beta

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

commit 3730e077fc04f96dd64f1c93b95dd7bee05fd5cd
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 08 Nov 2011 15:18:22 +0800
Tag:    v2.2.0-beta

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

commit 3a21e47829042f28d72f22dc650b206c16b13815
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 08 Nov 2011 14:50:16 +0800
Tag:    v2.2.0-beta

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

commit 7e63edc42f6200244e7e45ee84fefa6ac2a9885c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 08 Nov 2011 11:43:49 +0800
Tag:    v2.2.0-beta

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

commit d4bdd01bd2b6477ff38ee4bf790cff678ad089d5
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 08 Nov 2011 11:37:59 +0800
Tag:    v2.2.0-beta

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

commit 7a3a8fd0c5c04e093064d5919773abc256a1be74
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 08 Nov 2011 11:15:01 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-30154_master_wip' of git://github.com/grabs/moodle

commit ddba89cc2ab6071bd2fd24a2984939b319c9996b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 01 Nov 2011 15:18:44 +0800
Tag:    v2.2.0-beta

Merge branch 'w43_MDL-30005_m22_uri' of git://github.com/skodak/moodle

commit 203683e415e7cedca1944c38555d70e174224425
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 01 Nov 2011 13:23:03 +0800
Tag:    v2.2.0-beta

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

commit d29f4e055dde9e67820d64a36f231117ec7a7f82
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 01 Nov 2011 12:15:40 +0800
Tag:    v2.2.0-beta

Merge branch 'w43_MDL-29990_m22_navcontinue' of git://github.com/skodak/moodle

commit b68c0776320712a99fbcd188c614fc4cfa29fb38
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 01 Nov 2011 12:00:57 +0800
Tag:    v2.2.0-beta

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

commit d1e82ba966124aefce9f45b053b03e8cf717ff2b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 31 Oct 2011 17:19:14 +0800
Tag:    v2.2.0-beta

Merge branch 'w43_MDL-29922_m22_smarty' of git://github.com/skodak/moodle

commit c84f4700ec3ba6207ead924231c5ca4b918d14d7
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 31 Oct 2011 17:08:32 +0800
Tag:    v2.2.0-beta

Merge branch 'w43_MDL-29921_m22_qti2' of git://github.com/skodak/moodle

commit ae44df3c43648d57b2a304b3b5ae9056fe68d1dc
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 31 Oct 2011 16:10:00 +0800
Tag:    v2.2.0-beta

Merge branch 'w43_MDL-29972_m22_langreset' of git://github.com/skodak/moodle

commit c2c7d8715d80279ef74c657eb8ee5d1a26ba78b1
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 31 Oct 2011 16:05:12 +0800
Tag:    v2.2.0-beta

Merge branch 'w43_MDL-29966_m22_grouploading' of git://github.com/skodak/moodle

commit b6d2f5b266c1393095b0a1bb91dab9de729410ac
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 31 Oct 2011 15:25:55 +0800
Tag:    v2.2.0-beta

Merge branch 'w43_MDL-29984_m22_enroltoday' of git://github.com/skodak/moodle

commit 2636126f89747f039264c7ba1392b2ac79d5c408
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 31 Oct 2011 14:13:46 +0800
Tag:    v2.2.0-beta

Merge branch 'w43_MDL-30005_m22_uri' of git://github.com/skodak/moodle

commit 046391ea1105a2b7a61ea1522a2b1147c801678a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 31 Oct 2011 10:23:59 +0800
Tag:    v2.2.0-beta

Merge branch 'w43_MDL-29923_m22_removesearch' of git://github.com/skodak/moodle

commit a0b10b271f3627ded63748c132ae4caf4ab8bb6c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 26 Oct 2011 11:23:09 +0800
Tag:    v2.2.0-beta

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

commit 0e03740fc80c8e336f9d6f662fbad82c568f752e
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 24 Oct 2011 17:05:17 +0800
Tag:    v2.2.0-beta

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

commit 64fcc674f99ba065737ebe00b1eb653ec31a8996
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 24 Oct 2011 16:39:17 +0800
Tag:    v2.2.0-beta

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

commit 9809413bbaaa5bb0d9b52175db64665b6f06e29b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 24 Oct 2011 15:37:14 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29527' of git://git.luns.net.uk/moodle

commit 5117a3d789420a8a71a25d85f3f53788990f643a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 24 Oct 2011 14:21:39 +0800
Tag:    v2.2.0-beta

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

commit b077de82f9bf3a40fc66e379339e6e427a10eeeb
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 24 Oct 2011 13:26:28 +0800
Tag:    v2.2.0-beta

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

commit c11ccbfd8b650fdfc37b77c8a09e0074d010c4bd
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 24 Oct 2011 11:36:07 +0800
Tag:    v2.2.0-beta

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

commit fc09870e0e86ade039a746cf6c62675b39882c56
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 11 Oct 2011 13:37:34 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-27058-master' of git://github.com/samhemelryk/moodle.git (solved conflict)

commit 44d872b87eb2e9f51e0aef7057bb3795bdeb895c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 11 Oct 2011 11:19:14 +0800
Tag:    v2.2.0-beta

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

commit bdfb2b71b7cf3e3bbe6d2aa1c83dde072d360b54
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 11 Oct 2011 09:46:16 +0800
Tag:    v2.2.0-beta

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

commit e6d80c1d3e39fd05ed3d1118ee34edbd49224d87
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 11 Oct 2011 09:26:30 +0800
Tag:    v2.2.0-beta

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

commit aabf13c24002d6b60e23d33aab920ffefcf411e3
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 10 Oct 2011 23:14:05 +0800
Tag:    v2.2.0-beta

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

commit f7175860917b171ff789efa27fe8c12239a42c36
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 10 Oct 2011 22:45:01 +0800
Tag:    v2.2.0-beta

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

commit 73f5ebea0c787ec7e828dfe7c5a88a5643fa2f52
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 05 Oct 2011 10:54:05 +0800
Tag:    v2.2.0-beta

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

commit 2fbc7081864e79a93e251a2d8692ce280ab9671c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 05 Oct 2011 02:44:28 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29089_grade_history_missing_columns2' of git://github.com/andyjdavis/moodle.git (resolved version.php conflicts)

commit b735bd19cce4e1bc3d2a3e5f640d25b66f23ee25
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 03 Oct 2011 15:37:50 +0800
Tag:    v2.2.0-beta

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

commit c1b723e5f107389921936e980bf43deb9b15c5a3
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 03 Oct 2011 13:57:48 +0800
Tag:    v2.2.0-beta

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

commit 260316ce4812dcc23fcc94a9ecbd667abaa41d6d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 27 Sep 2011 14:52:00 +0800
Tag:    v2.2.0-beta

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

commit 59e2fd452394f4bd2a0950d3a827777389139b94
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 27 Sep 2011 13:22:14 +0800
Tag:    v2.2.0-beta

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

commit df1ed7d435bd522e1c7c5b83b66bf47f69a488d4
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 27 Sep 2011 11:18:17 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-25241_forum_search_ratings' of git://github.com/andyjdavis/moodle

commit b11bf8b841359a96a1220bd53a91572c2a4166e9
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 27 Sep 2011 10:19:06 +0800
Tag:    v2.2.0-beta

Merge branch 'w38_MDL-29510_m22_orglang' of git://github.com/skodak/moodle

commit 976624ad5eacf3cc6ab3c1427b3990ec559df01c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 26 Sep 2011 16:57:01 +0800
Tag:    v2.2.0-beta

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

commit 2ba08e4ba2bdb2e74b301c61e55f33c05b475c0d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 26 Sep 2011 16:00:04 +0800
Tag:    v2.2.0-beta

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

commit 94f59561ad70871e230fafacdbc6784e99ab910b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 26 Sep 2011 14:32:52 +0800
Tag:    v2.2.0-beta

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

commit 2a8702c158ae537cf13f165b36684d5ee9d07dd0
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 26 Sep 2011 13:47:20 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29333_rating_ajax' of git://github.com/andyjdavis/moodle

commit c9f7b5e20ba1956e10a8397c9ac480009947a9bf
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 20 Sep 2011 13:15:52 +0800
Tag:    v2.2.0-beta

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

commit 48a7eed5875d1d4bcd6c0aef63bd9ae8ceb482f9
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 20 Sep 2011 10:19:17 +0800
Tag:    v2.2.0-beta

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

commit aa601cca0a2d9623bbcb0222895f9e667d494270
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 19 Sep 2011 16:02:45 +0800
Tag:    v2.2.0-beta

Merge branch 's13_MDL-29036_ws_upload_master' of git://github.com/dongsheng/moodle

commit 9fee890b578240a4e7703638ee64972c27dcd607
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 19 Sep 2011 12:10:23 +0800
Tag:    v2.2.0-beta

Merge branch 's13_MDL-28509_youtube_master' of github.com:dongsheng/moodle

commit 631c9c02abbcc893663f3fead8b4817ae0f439c2
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Sep 2011 19:07:22 +0800
Tag:    v2.2.0-beta

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

commit d1e362405e617ea95ae65cccba33e92e4380b777
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Sep 2011 16:06:21 +0800
Tag:    v2.2.0-beta

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

commit 7eae2c5ae2d2001fef660d7a5101f356f8472231
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Sep 2011 13:52:31 +0800
Tag:    v2.2.0-beta

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

commit f7dd6bda3113530ca24a11b88261271fab5b435f
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Sep 2011 11:58:21 +0800
Tag:    v2.2.0-beta

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

commit 9568a4e87b8a518c2bf3f08647a5c4d5aae84e91
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Sep 2011 11:42:18 +0800
Tag:    v2.2.0-beta

Merge branch 'master' of git.moodle.org:/git/integration

commit 5433da6064002e1389e94ac06107a167b27ed19c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Sep 2011 11:38:55 +0800
Tag:    v2.2.0-beta

Merge branch MDL-29189-master of git://github.com/samhemelryk/moodle  - resolved conflicts.

commit 660a6aae02ec847470496d2fa71364a9d3ddabdf
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 05 Sep 2011 13:29:14 +0800
Tag:    v2.2.0-beta

Merge branch 'wip_MDL-27689_Vague_README-LDAP_master' of git://github.com/iarenaza/moodle

commit 57ef9c14cb16812b197544fc1a78328a993fd5ea
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 05 Sep 2011 13:01:23 +0800
Tag:    v2.2.0-beta

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

commit e2e1cf53dbcd77c9daf10ff6d294c23fb68de469
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 05 Sep 2011 12:10:32 +0800
Tag:    v2.2.0-beta

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

commit d9d76da9339ce2c271f7d6706d4a4a55ca9c3e12
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 30 Aug 2011 11:07:38 +0800
Tag:    v2.2.0-beta

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

commit a1b744594c414f2f3807a2b53ed71739bcce2a8d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 29 Aug 2011 12:10:30 +0800
Tag:    v2.2.0-beta

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

commit 553d343bf2786537d44e0b2aedbaaa5addb3bd23
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 24 Aug 2011 03:03:50 +0800
Tag:    v2.2.0-beta

Merge branch 'w33_MDL-28982_m22_sqlfullname' of git://github.com/skodak/moodle

commit 5ad0103d9d3444d8fcdc2238578b6bce961e00d6
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 24 Aug 2011 02:24:08 +0800
Tag:    v2.2.0-beta

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

commit 31d13687c9edffb54f43e103ae812c2da5dac9ef
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 23 Aug 2011 18:17:26 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-25636-master' of git://github.com/samhemelryk/moodle

commit f3d8c8a9a31383c50e0c88fcb968fd336e2a5bb2
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 23 Aug 2011 14:07:08 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28509_master' of git://github.com/marxjohnson/moodle

commit c6f94ea2fa5c31dd2367880c6ad3f734d9147fcb
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 23 Aug 2011 00:51:28 +0800
Tag:    v2.2.0-beta

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