Git merges in Moodle 2.2.5 by Sam Hemelryk

commit e40113160683514c35043456aca5ce0c47ad73b6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 08:20:16 +0800
Tag:    v2.2.5

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

commit c0941ec9963dc38be6c94113bacaf2ba1b01ea75
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 07:25:57 +0800
Tag:    v2.2.5

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

commit 926fffa1463316f62e55e350593be84fd056c3af
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 06:12:15 +0800
Tag:    v2.2.5

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

commit 1ac4b314f6f1ceb948c012ecf6ab89eb213dc9e6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 05:52:12 +0800
Tag:    v2.2.5

Merge branch 'MDL-30020c-22' of git://github.com/srynot4sale/moodle into MOODLE_22_STABLE

commit 5d44dbd1eb2a2f7564a273a68a21f32f0266aa94
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 15 Aug 2012 07:21:57 +0800
Tag:    v2.2.5

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

commit 5831c9f89103ce42edd39f4c05aecf3e85335623
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 08:04:40 +0800
Tag:    v2.2.5

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

commit 297e891c1fa4cc8e824f3f2f467ccbc9c5011d57
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 07:44:09 +0800
Tag:    v2.2.5

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

commit 07d8e5cfa7cd990b7e389fd68f634a5d71f86a94
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 07:04:47 +0800
Tag:    v2.2.5

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

commit f5543aa05e8c5ea5ed7c82ed1aad6bcfc4cd66af
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 06:58:18 +0800
Tag:    v2.2.5

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

commit b21f1749576804e087f3c3a0fcabbc5dd8da1fd8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:49:20 +0800
Tag:    v2.2.5

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

commit 6cb03ab5d34861e315e929f94c068008e7d28f39
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:40:37 +0800
Tag:    v2.2.5

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

commit 09c3821bf47e6a4bf861bbeb7bcccc5d98f0dd4a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:29:41 +0800
Tag:    v2.2.5

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

commit dd204f3a8f660d2f0229d64bb291962d35dc2f8f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:18:41 +0800
Tag:    v2.2.5

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

commit ab474e3e6d2c033687ac5852535a5f378ecd2078
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:15:49 +0800
Tag:    v2.2.5

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

commit d3fd4849ae74dbb0f488965027c2615d4bb89956
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 07:59:02 +0800
Tag:    v2.2.5

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

commit 775673d4b16d311b27411772c9eb882da4da8143
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Jul 2012 05:18:06 +0800
Tag:    v2.2.5

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

commit 0fd928ddeb35a4476a856538b35a1a107d652aa0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 08:25:09 +0800
Tag:    v2.2.5

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

commit 71268ddb625d110db3de4e8125d0a5182217fbbd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:49:28 +0800
Tag:    v2.2.5

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

commit 82bb3c039caa75a3409ee1aee4136804c0bf81e9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:37:59 +0800
Tag:    v2.2.5

Merge branch 'm22_MDL-34374' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit 5e202b6cb4991990381f33cc85d2b107780b0c16
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:26:41 +0800
Tag:    v2.2.5

Merge branch 'm22_MDL-34233' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit 5f6c20bca20bfdbbfd2c1f5dd8cfabd3e6745588
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 06:39:30 +0800
Tag:    v2.2.5

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

commit bff217f18b095e3dfc56912ceba41ba54fbf342a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Jul 2012 11:50:00 +0800
Tag:    v2.2.5

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

commit f1cb47f9a38ec2a5cb193d86479f3afb5c57a9c7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 09:50:48 +0800
Tag:    v2.2.5

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

commit 3c0d5ff61e1fa2aff35e0ea125bd896234e4115e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 07:57:25 +0800
Tag:    v2.2.5

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

commit a9fb701ad52d7640e5ec68825704b9b3eaee74c3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 07:50:13 +0800
Tag:    v2.2.5

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

commit aa83dea5e81860276188223c56a50bab5d17fb72
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 07:00:49 +0800
Tag:    v2.2.5

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

commit 0cc403cbe6138f3122ec15aa910c6c7617c525a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 06:49:57 +0800
Tag:    v2.2.5

Merge branch 'MDL-33917-2' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit 9f55156eb484e52710479b19eb94616947ee1394
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 05:18:36 +0800
Tag:    v2.2.5

Merge branch 'MDL-33788b-22' of git://github.com/srynot4sale/moodle into MOODLE_22_STABLE

commit f163de5a8ccb9058f3286b4956332626b3cd7e75
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 12 Jul 2012 14:24:36 +0800
Tag:    v2.2.5

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

commit 714f2d590a322cb1d4d84c0d1d6d085f14000af4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 08:09:14 +0800
Tag:    v2.2.5

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

commit 730ff61856b2a64f60c2b3804cdfb2b81507f83d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 08:05:42 +0800
Tag:    v2.2.5

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

commit df4066677524729402f73fce9279a92603032c56
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 06:28:37 +0800
Tag:    v2.2.5

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

commit 8e7d4f331720566f8d1c62d5459106363295b0e6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 06:24:23 +0800
Tag:    v2.2.5

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