Git merges in Moodle 2.2.6 by Dan Poltawski

commit ab8c8a8f920839855058b2cdde7ff18bd4ac311b
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 09 Nov 2012 17:54:19 +0800
Tag:    v2.2.6

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit 235ec73c0f2f06253e8fb627740be7823fad5b31
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 08 Nov 2012 18:55:20 +0800
Tag:    v2.2.6

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

commit 62c2b3d818937b6b1fdd807f6adcf3dd6ddcde12
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 08 Nov 2012 11:08:17 +0800
Tag:    v2.2.6

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

commit 025ca6f7d302696be9df02adc20c626313f6dfe9
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 Nov 2012 09:28:02 +0800
Tag:    v2.2.6

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

commit d46929e4e3dee6d624b9d744edeefd8cb726e81e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Nov 2012 16:21:18 +0800
Tag:    v2.2.6

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

commit 70a5dda65a4cec7934160a43e86cc6a0ad378bdb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Nov 2012 09:50:30 +0800
Tag:    v2.2.6

Merge branch 'wip-MDL-36379-m22' of git://github.com/samhemelryk/moodle into MOODLE_22_STABLE

commit 9cbc51937a14a0ae5af507f6b0e794ffdcbd3e3f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 05 Nov 2012 15:11:46 +0800
Tag:    v2.2.6

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

commit 3339623dc0449e8a789aa0b041d004b656eddceb
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 05 Nov 2012 13:25:26 +0800
Tag:    v2.2.6

Merge branch 'wip-MDL-34527-m22' of git://github.com/samhemelryk/moodle into MOODLE_22_STABLE

commit e262ca4250c2a211626cbf81716ac3e5d129e8a2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 05 Nov 2012 11:12:49 +0800
Tag:    v2.2.6

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

commit 3fd59e36744d584944f65f9742a850a4b1926f3b
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 02 Nov 2012 12:07:21 +0800
Tag:    v2.2.6

Merge branch 'w42_MDL-35469_m22_geckover' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit e8a8691a10cc8fc3a235d266dc97596cdbf63fcd
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 01 Nov 2012 14:14:27 +0800
Tag:    v2.2.6

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit 02017cb9f325897fa832b9079ae20d1eb3869f54
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 31 Oct 2012 13:42:31 +0800
Tag:    v2.2.6

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

commit 18da8c03e03ef68dc5622dc65492e60a40dc6a93
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 31 Oct 2012 11:59:34 +0800
Tag:    v2.2.6

Merge branch 'MDL-32712-22' of https://github.com/mackensen/moodle into MOODLE_22_STABLE

commit 9787d3a9b57024b9005d53238570007c703dfe0c
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 31 Oct 2012 10:51:03 +0800
Tag:    v2.2.6

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

commit 279fe97bd2cdf1e319c17aa327fdfc7a0a5b75d4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Oct 2012 13:40:44 +0800
Tag:    v2.2.6

Merge branch 'wip-MDL-32326-m22' of git://github.com/samhemelryk/moodle into MOODLE_22_STABLE

commit 4c8582b8c0641eb5bcab46ec2e9eedc632584427
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Oct 2012 12:12:01 +0800
Tag:    v2.2.6

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

commit d258956c4a0dfb9bbee5ea37a3671b18ce3c0d07
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 30 Oct 2012 10:00:31 +0800
Tag:    v2.2.6

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

commit f767e4b0661807d17ae29e5aa368c046605c7ca3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Oct 2012 15:34:03 +0800
Tag:    v2.2.6

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

commit 864a95aab375e849a580d27542b18629fcc55b9c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Oct 2012 14:35:35 +0800
Tag:    v2.2.6

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

commit 2407b73f18c6549cac354b4dc7eefe3b43aacf3c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Oct 2012 13:55:25 +0800
Tag:    v2.2.6

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

commit 00f581ca283fc7e4a67a2d536c6925817d98f411
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Oct 2012 16:27:59 +0800
Tag:    v2.2.6

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

commit a407d10f1e99cd627ef2a27fb36b4fd2978bd1e4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Oct 2012 14:59:23 +0800
Tag:    v2.2.6

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

commit d44a43190abd7c249ed280418c52e5e64a39671c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Oct 2012 14:35:45 +0800
Tag:    v2.2.6

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

commit cecd632a8a284b0f0ce744aa87dabdbd47f99e1c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Oct 2012 11:09:14 +0800
Tag:    v2.2.6

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

commit 991eb4f6d01768f7bfb3929666b8cb4604d2b972
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Oct 2012 10:46:58 +0800
Tag:    v2.2.6

Merge branch 'wip-MDL-32184-s22' of http://github.com/phalacee/moodle into MOODLE_22_STABLE

commit 4e2c6207008ebedcce7e57d18e1d51d23a70f00a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Oct 2012 10:30:11 +0800
Tag:    v2.2.6

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

commit 1c61cadaaffc3e5a6a35f80c1a4686f6dba9fcc1
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 03 Oct 2012 10:26:34 +0800
Tag:    v2.2.6

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

commit f1879226959e40970a19ca8b87389824371fa03f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Oct 2012 13:57:08 +0800
Tag:    v2.2.6

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

commit 73e4647509b86725ab3a1b121bddb5764f9e45fc
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Oct 2012 12:09:44 +0800
Tag:    v2.2.6

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

commit a028dd0ff14388a15c04cd9aca1bb97c082297b4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Oct 2012 11:48:15 +0800
Tag:    v2.2.6

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

commit 9956462ee48cccbe9479eb9f3f670928d34a8421
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Oct 2012 11:37:04 +0800
Tag:    v2.2.6

Merge branch 'WIP-MDL-35708-M22_quiz' of git://github.com/nadavkav/moodle into MOODLE_22_STABLE

commit 34ab1dd7b1e7a77e01c2e6f94842e4c8522b9348
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Oct 2012 10:42:06 +0800
Tag:    v2.2.6

Merge branch 'w40_MDL-35619_m22_otheravatars' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit e412ca95b491224da66d7d0eab2b565c78cbe0fe
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Oct 2012 10:35:00 +0800
Tag:    v2.2.6

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

commit f3493f8a78d1d3061d7acdc49a3b232a9ee678fa
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Oct 2012 09:52:50 +0800
Tag:    v2.2.6

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

commit 9b112d78bc1a6c17452b7d0b93b65570afd0ba0f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Oct 2012 09:33:24 +0800
Tag:    v2.2.6

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

commit d935a6fd68961ebbb34a97fac0bbdfafb5bd90c5
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 27 Sep 2012 18:48:00 +0800
Tag:    v2.2.6

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit 7062b887dbe7b4a3a53c931afd3adc946b69b3c9
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 25 Sep 2012 13:43:49 +0800
Tag:    v2.2.6

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

commit 71919db800bb117c3f8f82824cc12ca0f176c9f4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 25 Sep 2012 13:11:19 +0800
Tag:    v2.2.6

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

commit b37dc152c2422986c7cb2b04df3fbd744991eba5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 24 Sep 2012 16:48:32 +0800
Tag:    v2.2.6

Merge branch 'MDL-35207-workshop-attachments-upgrade_22' of git://github.com/mudrd8mz/moodle into MOODLE_22_STABLE

commit 370cb335b1358942ccf83d199e430e61c1af533d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 24 Sep 2012 15:36:18 +0800
Tag:    v2.2.6

Merge branch 'wip-MDL-32184-s22' of http://github.com/phalacee/moodle into MOODLE_22_STABLE

commit c5a5eed7f97855a91eb509f07dc03c8c3f9c6768
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 24 Sep 2012 15:32:41 +0800
Tag:    v2.2.6

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

commit 39005168863be0863886e1e4d33c692ca1de5c63
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 24 Sep 2012 11:08:26 +0800
Tag:    v2.2.6

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

commit 92238a44081f5b009318e4e882060b816e28dece
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 24 Sep 2012 10:20:09 +0800
Tag:    v2.2.6

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

commit 8dd5f4f086b1a87e6278f6361701cc78f471be6a
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 20 Sep 2012 14:06:45 +0800
Tag:    v2.2.6

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit b4e47dbb93496a339dae12df3a9cffbf9fda900e
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 19 Sep 2012 09:52:28 +0800
Tag:    v2.2.6

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

commit 8e5440c9fc0627f23169580dd54d6b0be2269e63
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Sep 2012 15:08:08 +0800
Tag:    v2.2.6

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

commit d875f8605ebe3205ca648942d96340345462e084
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Sep 2012 14:52:04 +0800
Tag:    v2.2.6

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

commit 9facd25c148594a4781466c218def12acdcd2ef5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Sep 2012 12:40:12 +0800
Tag:    v2.2.6

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

commit f0cbaa1c19eb4ddb40baf2ac7c8e95729b6bb7f1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Sep 2012 12:00:24 +0800
Tag:    v2.2.6

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