Git merges in Moodle 2.2.6 by Sam Hemelryk

commit e3071745bbc38da2452eecad041609dc9fafe152
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Nov 2012 06:06:41 +0800
Tag:    v2.2.6

Merge branch 'MDL-36271_m22' of https://github.com/markn86/moodle into MOODLE_22_STABLE

commit 3e8532dadcb8d04ca8cbc73cda13abb6a9d1584a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Nov 2012 05:08:22 +0800
Tag:    v2.2.6

Merge branch 'MDL-31629-MOODLE_22_STABLE' of git://github.com/micaherne/moodle into MOODLE_22_STABLE

commit fdd57e090e235d994f3fc77bba46d31f1fcaaa9d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Nov 2012 11:27:15 +0800
Tag:    v2.2.6

Merge branch 'MDL-21625_b_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit 61f0581a022aa0cd8cdbd269461f7ce60f5c339a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 31 Oct 2012 05:15:18 +0800
Tag:    v2.2.6

Merge branch 'MDL-31934_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit e16c4341405be883688c83b4fa6df71b6c6b2faa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 12:36:33 +0800
Tag:    v2.2.6

Merge branch 'MDL-28235-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit b277186a4ecd594eefa707d9631626e5b343712b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 10:48:45 +0800
Tag:    v2.2.6

Merge branch 'MDL-35889-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 0be66059a24915f055071be2d22ac6a92b23cc52
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 07:59:02 +0800
Tag:    v2.2.6

Merge branch 'MDL-36076_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 15b3f4332662c431fe03a8d41e723705fe7f4c0e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 07:51:34 +0800
Tag:    v2.2.6

Merge branch 'MDL-36103_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit d3eb32a44e28d6c5d0a140700560b76ec8ecc05b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 17:41:19 +0800
Tag:    v2.2.6

Merge branch 'MDL-35412-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit d270f6c22d314dd43b8d2e24a3fc165586aede74
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 11:22:44 +0800
Tag:    v2.2.6

Merge branch 'MDL-35198-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit 0766ae0049b5772af6ca9e9cfa564e45345fa2f3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 06:36:12 +0800
Tag:    v2.2.6

Merge branch 'MDL-35634-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit c11496e22da1338f9d63c9865dbee1c224f03aa9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 06:02:24 +0800
Tag:    v2.2.6

Merge branch 'MDL-35211_M22' of git://github.com/kordan/moodle into MOODLE_22_STABLE

commit ac78fb7625c5f661878ecec7bbf2b65f41a7346f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 05:15:29 +0800
Tag:    v2.2.6

Merge branch 'MDL-35667_extra_credit_loop_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 4f012c5e581f28f4d5c655e92f28646eac02a02d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 05:05:52 +0800
Tag:    v2.2.6

Merge branch 'MDL-35730_22' of https://github.com/aolley/moodle into MOODLE_22_STABLE

commit bd465e3917e0ab451a7a18e5216431cc91d81b70
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 03 Oct 2012 05:07:04 +0800
Tag:    v2.2.6

Merge branch 'MDL-33829_22' of https://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit d5cb1a40966f9bea25173c97adb7bac2c3e94597
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Oct 2012 06:10:13 +0800
Tag:    v2.2.6

Merge branch 'm22_MDL-35472' of git://github.com/totara/moodle into MOODLE_22_STABLE

commit 4fd7c545cc321d59997d4b0d2b1e93f5a41150ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Oct 2012 05:45:44 +0800
Tag:    v2.2.6

Merge branch 'MDL-34257_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 7697512a90cf00c13581965d970057cfab2956a2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Oct 2012 05:15:19 +0800
Tag:    v2.2.6

Merge branch 'MDL-35547_22' of git://github.com/enovation/moodle into MOODLE_22_STABLE

commit 57264882c7fbde6bf4e6cf6c6f9caa21e7867c0c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Sep 2012 10:27:52 +0800
Tag:    v2.2.6

Merge branch 'wip-MDL-34476-stable22' of git://github.com/phalacee/moodle into MOODLE_22_STABLE

commit 414568e1446cbc58a41f46f65fc84a6af73b53ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Sep 2012 06:10:11 +0800
Tag:    v2.2.6

Merge branch 'MDL-34573_accessibility_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit d122b474567e9b1e560dd3eb6997ae3226910f63
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Sep 2012 04:32:41 +0800
Tag:    v2.2.6

Merge branch 'wip-MDL-34476-stable22' of git://github.com/phalacee/moodle into MOODLE_22_STABLE

commit 1b00f61d8763f5a9bc8e31a1f66133ff673fbc50
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Sep 2012 04:20:30 +0800
Tag:    v2.2.6

Merge branch 'MDL-31976-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 22d38f8b2ead8532882f26505be4b08e27444691
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Sep 2012 05:54:52 +0800
Tag:    v2.2.6

Merge branch 'MDL-34607-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 3b9ed3037f85b3dfc57b310a0de88a74d83876d0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:42:06 +0800
Tag:    v2.2.6

Merge branch 'MDL-35379-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 782a1b46330c514dc6cdbe695555610de540714e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:21:21 +0800
Tag:    v2.2.6

Merge branch 'MDL-35517_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE

commit d2621a28f58a015a8bf39392ce02d7c2f92c2071
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:05:35 +0800
Tag:    v2.2.6

Merge branch 'MDL-30889-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 04ec524d74dd1463d7fd053faf9c9123bca4a7cb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 13 Sep 2012 07:25:29 +0800
Tag:    v2.2.6

Merge branch 'm22_MDL-32125_forum_subscription_change_reflected' of git://github.com/kanikagoyal/moodle into MOODLE_22_STABLE

commit b7367b9638154dcc3c38c4657a266473fc0532e2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 13 Sep 2012 07:18:03 +0800
Tag:    v2.2.6

Merge branch 'wip-mdl-30667-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 0686d3dc4c1ef1e1207b75255e7cd2c67eb4e68d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 13 Sep 2012 07:12:37 +0800
Tag:    v2.2.6

Merge branch 'MDL-29872_c_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit b95d2cc35e531301d3081fca3f6dd991dcb69dbd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Sep 2012 06:27:40 +0800
Tag:    v2.2.6

Merge branch 'MDL-30829-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit ccbf68066bd381b0a5e240e992fedb923fad2d73
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:31:09 +0800
Tag:    v2.2.6

Merge branch 'MDL-34765-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 4340e2faace07f7eb45870cd789640515648a749
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:21:44 +0800
Tag:    v2.2.6

Merge branch 'MDL-30018_22' of https://github.com/stronk7/moodle into MOODLE_22_STABLE

commit 1db9d1e7ec24f7e37c91fdeddd4127b158ed708c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:18:31 +0800
Tag:    v2.2.6

Merge branch 'MDL-10259_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE

commit 22f55d840cf86cfa148027bfe7fa18259a90c438
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:10:39 +0800
Tag:    v2.2.6

Merge branch 'MDL-30857_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE

commit b818dfc2d7e3c316b4a00b884bade3e7c625c7b5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 08:06:04 +0800
Tag:    v2.2.6

Merge branch 'MDL-34916_M22' of git://github.com/kordan/moodle into MOODLE_22_STABLE

commit 94ff6cf6fb261c9274d42bcc71792936df51adb4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 07:15:14 +0800
Tag:    v2.2.6

Merge branch 'MDL-27786-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit f50e16d07e26736040db2792cc70ce9f31a7a807
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 07:10:15 +0800
Tag:    v2.2.6

Merge branch 'MDL-33374-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE