Git merges in Moodle 2.5.1 by Sam Hemelryk

commit f0d974fb28d8ddeb77663eb2d25886930608a9ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Jul 2013 06:31:28 +0800
Tag:    v2.5.1

Merge branch 'MDL-39733_25' of git://github.com/stronk7/moodle into MOODLE_25_STABLE

commit ebc9b6d15833c40d4fa3aded8c7e4686765d0fd8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Jul 2013 09:47:50 +0800
Tag:    v2.5.1

Merge branch 'MDL-40069_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit d20391916c7a464a47aa5d6bbff48d824b503b65
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Jul 2013 09:17:48 +0800
Tag:    v2.5.1

Merge branch 'wip-MDL-39741-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit 9a561bc5a1430f11bb68ac6bae4888863c61b82a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Jul 2013 09:08:15 +0800
Tag:    v2.5.1

Merge branch 'MDL-35206-email-links_25' of git://github.com/mudrd8mz/moodle into MOODLE_25_STABLE

commit 6e07abb32dbe4d11a6267e622a2d16621cf5fb9c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Jun 2013 05:58:44 +0800
Tag:    v2.5.1

Merge branch 'wip-MDL-40065-m25_4' of git://github.com/gjb2048/moodle into MOODLE_25_STABLE

commit bc0227d3e5a1145225f5df45324e6b302befa21f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Jun 2013 05:13:05 +0800
Tag:    v2.5.1

Merge branch 'w26_MDL-40289_m25_badgescaps' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 4418496864cab6ddc3a9d73e21d0cab45c54cc91
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 11:41:24 +0800
Tag:    v2.5.1

Merge branch 'wip-MDL-39044-stable25' of git://github.com/phalacee/moodle into MOODLE_25_STABLE

commit 82125f7a78b29f50f58995a31050d3502f522cdf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 11:07:14 +0800
Tag:    v2.5.1

Merge branch 'w26_MDL-39701_m25_filterupgrade' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 9e5adb930599c9b4a1f6dea27f8b2010863e4215
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 10:33:04 +0800
Tag:    v2.5.1

Merge branch 'MDL-39779_m25' of git://github.com/rwijaya/moodle into MOODLE_25_STABLE

commit 23dd6b7ebf53b3fce43f42905578ac93f7d96693
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 10:29:56 +0800
Tag:    v2.5.1

Merge branch 'MDL-39760-MOODLE_25_STABLE' of https://github.com/lucisgit/moodle into MOODLE_25_STABLE

commit 12a9b4ec3a7d7f36783bdeef79a82e314b47eb2b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 07:43:54 +0800
Tag:    v2.5.1

Merge branch 'mdl25-MDL-40130-let-course-category-caching-be-used' of git://github.com/brki/moodle into MOODLE_25_STABLE

commit 405a60712b1364e9c419fc0f02fd3f77d36b1204
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 06:30:08 +0800
Tag:    v2.5.1

Merge branch 'MDL-28124_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE

commit 70d4b3182d8f5f90e30715985c144cfec670fda9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 10:50:47 +0800
Tag:    v2.5.1

Merge branch 'MDL-39634_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit 663c69e9740ddcdd1b6c9efda030588d95330cdd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 09:59:30 +0800
Tag:    v2.5.1

Merge branch 'MDL-40036-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit eaf48543592cb4752454d33d740f90ee105093a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 09:54:56 +0800
Tag:    v2.5.1

Merge branch 'MDL-39865-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit 3d19b183c66157e3f426bddd13feb4d891a4410c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 07:19:30 +0800
Tag:    v2.5.1

Merge branch 'wip-mdl-39863-m25' of git://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE

commit d81ebc8f0dafb7a572978252ed102604217b8287
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 07:07:57 +0800
Tag:    v2.5.1

Merge branch 'MDL-40109_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit 54c7d518f3f9fd0e0fb9b82608abf7ba09c4b88e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 06:26:53 +0800
Tag:    v2.5.1

Merge branch 'MDL-30132_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE

commit e15bf9b1e5ee05cb8e81f8ee54d60f067db34ba4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 12:10:38 +0800
Tag:    v2.5.1

Merge branch 'm25_MDL-40095_Completion_locked_Error_on_save' of https://github.com/scara/moodle into MOODLE_25_STABLE

commit 1d1b52eb0cb559732ffc91e82ac3d09129d04710
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 11:45:33 +0800
Tag:    v2.5.1

Merge branch 'MDL-21933_25' of https://github.com/mr-russ/moodle into MOODLE_25_STABLE

commit 209658eab2c8e38a45d22a55c417a6350ef542a6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 11:43:18 +0800
Tag:    v2.5.1

Merge branch 'wip-MDL-40091-MOODLE_25_STABLE' of git://github.com/satrun77/moodle into MOODLE_25_STABLE

commit 8c155823cc61f80ff42c2da715838e3da46769b6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 11:10:21 +0800
Tag:    v2.5.1

Merge branch 'MDL-39369_m25' of git://github.com/rwijaya/moodle into MOODLE_25_STABLE

commit 443563a82ee921bc497af87ff07cd8d31abc7f8c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 10:26:37 +0800
Tag:    v2.5.1

Merge branch 'MDL-39761-MOODLE_25_STABLE' of https://github.com/lucisgit/moodle into MOODLE_25_STABLE

commit 69303857c75c373dbe1914f9019ba48e0d282998
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:06:33 +0800
Tag:    v2.5.1

Merge branch 'MDL-39940-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

commit a4848b404463c028f4cc70b7b76431539be5465d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:02:40 +0800
Tag:    v2.5.1

Merge branch 'MDL-39964-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

commit a6b980d13b6d40f9292c896a1c0fbc567c310a3b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:00:11 +0800
Tag:    v2.5.1

Merge branch 'MDL-25901-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

commit 9e53bbd007ed6b7b0a2af8727a7c8c0835c5a54c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 04:53:49 +0800
Tag:    v2.5.1

Merge branch 'w24_MDL-38109_m25_pluginlist' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit e0699a7154b5235d631b148fb53a4ce8391e6378
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 04:51:21 +0800
Tag:    v2.5.1

Merge branch 'wip-MDL-39798_M25' of git://github.com/gjb2048/moodle into MOODLE_25_STABLE

commit aa41f96d1a501c82b698464a2b121bfda34495b6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 04:46:45 +0800
Tag:    v2.5.1

Merge branch 'wip-MDL-39820_M25_2' of git://github.com/gjb2048/moodle into MOODLE_25_STABLE

commit 624f270a262fc411dc79e66824b8c2c651e6fdd3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 13:31:36 +0800
Tag:    v2.5.1

Merge branch 'MDL-26925-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

commit 313bcd5268c173f9ebfecb784c3bd683f38d2bbc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 13:07:24 +0800
Tag:    v2.5.1

Merge branch 'MDL-22390_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit afe247a0ca5ac05ec747cc5243924a663b5b3a55
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 11:48:11 +0800
Tag:    v2.5.1

Merge branch 'w24_MDL-39549_m25_cohortsearch' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit f7c29429616221c11cac1d233974db9bbb528763
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 11:09:34 +0800
Tag:    v2.5.1

Merge branch 'MDL-39971_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit f981643f585929445d10d47f9e323af268a79993
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 10:44:40 +0800
Tag:    v2.5.1

Merge branch 'MDL-39978_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit 2f8602990f81cde9fe88041a919b747ff40130fc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 10:41:07 +0800
Tag:    v2.5.1

Merge branch 'w24_MDL-32480_m25_imscp' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 08c2a3ca1fd4108a889fc30a2ddc4f7e0bbe9642
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 08:14:04 +0800
Tag:    v2.5.1

Merge branch 'wip-MDL-40088-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit 00afef17bb68bce4b3f15d1b8fd7eb8dd32b7108
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 07:33:59 +0800
Tag:    v2.5.1

Merge branch 'MDL-39979-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE