Git merges in Moodle 2.1.2 by Aparup Banerjee

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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