Git merges in Moodle 2.2.5 by Aparup Banerjee

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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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