Git merges in Moodle 2.2.5 by Dan Poltawski

commit faf8ef6f04e3120ab5e7ac48ac099b2727a3a800
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 22 Aug 2012 09:16:32 +0800
Tag:    v2.2.5

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

commit 4263e87000577d977dddf416b95ca6ad2c007c29
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Aug 2012 12:35:23 +0800
Tag:    v2.2.5

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

commit 08d2cbe451548e98d356258ca479040efab25f73
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Aug 2012 11:59:38 +0800
Tag:    v2.2.5

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

commit 65329711051cded156cfef0ca81951e78f7da375
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Aug 2012 11:01:02 +0800
Tag:    v2.2.5

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

commit 0863fbe14a184dee815f1388b7fe7d95d26ec229
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Aug 2012 15:59:06 +0800
Tag:    v2.2.5

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

commit 954941700786a9acbb44528a45a2c4969e08797a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Aug 2012 14:23:35 +0800
Tag:    v2.2.5

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

commit 00fe761b3eb360259b2a5b8306949c89d799aab4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Aug 2012 12:07:02 +0800
Tag:    v2.2.5

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

commit 2f7ca09572a19cd63bfc7d92e9e3eefc08554e0d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Aug 2012 12:01:43 +0800
Tag:    v2.2.5

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

commit b869f5d045759604b65286f0e571c739f7baa3df
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Aug 2012 11:57:27 +0800
Tag:    v2.2.5

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

commit d2dccd8162b6f6e2eb50c7aaadccce7bf350ceaf
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Aug 2012 11:40:07 +0800
Tag:    v2.2.5

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

commit 279c39f71d88a05713471f5f1d8824ad15e36424
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Aug 2012 11:22:34 +0800
Tag:    v2.2.5

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

commit 8f4ff87e5e401458e37a75d6e80cdf88f5e5bb43
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Aug 2012 13:33:16 +0800
Tag:    v2.2.5

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

commit 37b1a5264bfdf6cee6dbc1bfb1eda8556f1a5e84
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Aug 2012 12:08:09 +0800
Tag:    v2.2.5

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

commit 3311b367ae54349b30a0fa5fd2f5bb6c8f01941f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Aug 2012 10:20:35 +0800
Tag:    v2.2.5

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

commit 2dc3011aaf6534f8ec175b7a35785f641b92641c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Aug 2012 10:16:59 +0800
Tag:    v2.2.5

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

commit 74552ee06aa2048de3837b28ec1f02b599b8509a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Aug 2012 10:03:27 +0800
Tag:    v2.2.5

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

commit c8a605729d0585f992f21701870fc3c6d1ade111
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Aug 2012 08:48:45 +0800
Tag:    v2.2.5

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

commit ab6f805dd47677db9ec1def0f565afc099b88668
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Aug 2012 15:49:18 +0800
Tag:    v2.2.5

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

commit 572024c4e6877820346751ed1600945e3cb95aa4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Aug 2012 14:42:19 +0800
Tag:    v2.2.5

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

commit c834462e08c20da85cae5d4d76f3e9fb67cfbddc
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Aug 2012 14:09:02 +0800
Tag:    v2.2.5

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

commit a0e776e02d2d8eac1056adff1e69cb9f97299d95
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Aug 2012 13:53:03 +0800
Tag:    v2.2.5

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

commit 957576fd62ee328a979a513c4f5377ec4c338469
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Aug 2012 12:21:50 +0800
Tag:    v2.2.5

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

commit dc5ab79d39b6ee28c9259dd23a4bf663492feaaf
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Aug 2012 12:12:38 +0800
Tag:    v2.2.5

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

commit d4e606c8c0d3266a21855a1a09265f97f3905ce0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Aug 2012 12:06:47 +0800
Tag:    v2.2.5

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

commit d0374ba31ec49e188b6b60e6226839aa29bd8d45
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Aug 2012 11:54:19 +0800
Tag:    v2.2.5

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

commit 9980863f3014a83b9f95bff0491b441e0e9ead15
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Aug 2012 11:49:59 +0800
Tag:    v2.2.5

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

commit b02ff428decdddea4fcb102fab941b77bfa427df
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Aug 2012 11:31:44 +0800
Tag:    v2.2.5

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

commit 77c3dbfc77afa1176f3199562429c12a2d498b05
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Aug 2012 10:40:51 +0800
Tag:    v2.2.5

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

commit 659a30df30bd50dee59968f8dea5f138647aa992
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Aug 2012 10:11:33 +0800
Tag:    v2.2.5

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

commit c574b5dddd1133ed24b6b4f982d7782b662cfb08
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Aug 2012 10:06:40 +0800
Tag:    v2.2.5

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

commit b690238e6be5a27a1c5cef02ae6e3b0a9ebdcd0b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Aug 2012 09:46:03 +0800
Tag:    v2.2.5

Merge branch 'w32_MDL-34585_m22_blogfiles' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit a14127cdbc97f0010215905faba3164ffd871acc
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 31 Jul 2012 17:46:27 +0800
Tag:    v2.2.5

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

commit 254f6e4d96ca1c00a78a27eb33a9da8b598eb980
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 31 Jul 2012 17:42:57 +0800
Tag:    v2.2.5

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

commit 6b117335248d5de46e794b46306bb7a65ba041cf
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 31 Jul 2012 12:02:20 +0800
Tag:    v2.2.5

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

commit a40624990c124e95df03307600bec97e4c5ddc8c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 31 Jul 2012 11:10:44 +0800
Tag:    v2.2.5

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

commit b5affb62a8577ce0b79b40b6d2eb873df176ca4c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 31 Jul 2012 10:32:00 +0800
Tag:    v2.2.5

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

commit e9c07086338fed24a1c20d9c576e8222fc3bc0f6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 31 Jul 2012 09:12:37 +0800
Tag:    v2.2.5

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

commit 7a9aacfcceff362dd9d9e9f735e7acc87eb158b7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Jul 2012 14:05:07 +0800
Tag:    v2.2.5

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

commit fe8dff2b01ea86d83c73203855796c7ea893344a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Jul 2012 13:56:13 +0800
Tag:    v2.2.5

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

commit a1355c48761818b8b1d0cf77a39d519894689c82
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Jul 2012 13:46:40 +0800
Tag:    v2.2.5

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

commit 368fb633462f636e88fa4e663f2e5ddcfb8c04fe
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Jul 2012 12:35:17 +0800
Tag:    v2.2.5

Merge branch 'w31_MDL-34538_m22_validatefloats' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 617eabaf8728741d7aa40209200847ebc7f7ad22
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Jul 2012 12:15:57 +0800
Tag:    v2.2.5

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

commit 0022ff1787f603b3ca3cfc12997e4aa1bd5fa12f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Jul 2012 12:05:36 +0800
Tag:    v2.2.5

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

commit f2a59d76d00572859f51768c7379454d8953c478
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Jul 2012 11:58:06 +0800
Tag:    v2.2.5

Merge branch 'MDL-34519_22_course_reset_patch' of git://github.com/rlorenzo/moodle into MOODLE_22_STABLE

commit 60f519014979460ef645600898afd984ce6441c7
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 25 Jul 2012 12:29:56 +0800
Tag:    v2.2.5

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

commit 59cc0091527e5589c4a2dbdb244776f21116f756
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Jul 2012 14:02:15 +0800
Tag:    v2.2.5

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

commit 5d6842891e956a95cde4b600c8b749ac5765a00d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Jul 2012 13:54:11 +0800
Tag:    v2.2.5

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

commit 5d32507ebea91c489418a865edd0497579ef6b23
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Jul 2012 13:26:20 +0800
Tag:    v2.2.5

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

commit 7dd07a8d38d63d53101bb8ee4496c144c029fd66
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Jul 2012 12:20:16 +0800
Tag:    v2.2.5

Merge branch 'w30_MDL-34396_m22_loginhttpsspell' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 9c2d2071ee4abf8a8708279c0578fe24e9c91b74
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 19 Jul 2012 13:42:26 +0800
Tag:    v2.2.5

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit 6fc4e1becb6b5c0fb0ea4ca6d2411a03ec196369
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 16 Jul 2012 15:57:43 +0800
Tag:    v2.2.5

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

commit 5d0d6c692c32d5a36dcfbf37cd03622f209b5acf
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 16 Jul 2012 14:33:06 +0800
Tag:    v2.2.5

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

commit 38d358fc37a3025e8dde1cb940c7208916e2684b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 16 Jul 2012 14:26:15 +0800
Tag:    v2.2.5

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

commit 49b48423251a4503c5be7e822a57eaabf283303e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 16 Jul 2012 11:34:29 +0800
Tag:    v2.2.5

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

commit 091c72538242e73f745549cab49d9a7f22821efc
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 16 Jul 2012 11:01:16 +0800
Tag:    v2.2.5

Merge branch 'w29_MDL-34271_m22_mysqlcollation' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 62b488086b0c56033e1c0b23a02ca6e1736bdeb9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 16 Jul 2012 10:05:59 +0800
Tag:    v2.2.5

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

commit 400cf711e090216194daf1b21e3648f3307d4abf
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 12 Jul 2012 15:50:35 +0800
Tag:    v2.2.5

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit 4fdabcce0e5b31669a6f2e9813658537ed92fb54
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Jul 2012 09:25:32 +0800
Tag:    v2.2.5

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

commit 1e73d1ddaac5b05b43c15676de5aac0e5c2c5947
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Jul 2012 14:27:23 +0800
Tag:    v2.2.5

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

commit a36631fcee92460760c073f5ec33eabbb64901b8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Jul 2012 14:14:25 +0800
Tag:    v2.2.5

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

commit 92e63062d4faa62edf5a6e74d16fa2c7f455a5c5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Jul 2012 13:42:40 +0800
Tag:    v2.2.5

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

commit 1c426aca1a1d4cf2a5144db43454f4e8acdcc5c4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Jul 2012 13:39:27 +0800
Tag:    v2.2.5

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

commit 98fb4b4f09f21c04d6f629bd34e65b63abfe45c0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Jul 2012 13:37:47 +0800
Tag:    v2.2.5

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

commit 4dff0a79edd5108fdfe1f804d7f2e96c04ec4ef2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Jul 2012 10:32:00 +0800
Tag:    v2.2.5

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