Git merges in Moodle 2.6.1 by Eloy Lafuente (stronk7)

commit 02b5deb65a57b85b5c65ab8d70810fcbdfd88e14
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 Jan 2014 17:10:27 +0800
Tag:    v2.6.1

Merge branch 'MDL-43590-en_fix_26' of git://github.com/mudrd8mz/moodle into MOODLE_26_STABLE

commit d9aa7cbb6fe5a8a4a138035e2ef17fd5bfb94fe6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 Jan 2014 06:07:52 +0800
Tag:    v2.6.1

Merge branch 'wip-MDL-43283-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

commit a3fa0ca96fdfd574d2bf6a8fb0fe86d288ee6948
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 09:17:42 +0800
Tag:    v2.6.1

Merge branch 'MDL-40119-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 895e16ff28918999ee351bbc399d3c3017cc942b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 09:10:36 +0800
Tag:    v2.6.1

Merge branch 'w01_MDL-42797_m26_admin' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 93073173ce10cd66147dac01f96450058787f5d8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 09:02:56 +0800
Tag:    v2.6.1

Merge branch 'MDL-43423_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE

commit 5c283bb71367593e1143dcd5f0d7a3b29b94abe8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 08:52:12 +0800
Tag:    v2.6.1

Merge branch 'wip-MDL-42310-26' of git://github.com/abgreeve/moodle into MOODLE_26_STABLE

commit 52d8541b5b688881ac35d21cb18a1699542c090c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 07:46:13 +0800
Tag:    v2.6.1

Merge branch 'm26_MDL-43508_Invalid_String_Identifier' of https://github.com/scara/moodle into MOODLE_26_STABLE

commit 99a57908f53a4489b756d4a28a211b80fb0a9aba
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 07:42:45 +0800
Tag:    v2.6.1

Merge branch 'MDL-42607_rss_26' of https://github.com/andyjdavis/moodle into MOODLE_26_STABLE

commit ebe415f889fc3ea303f1ca8ef358f3c4edc57646
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 07:33:48 +0800
Tag:    v2.6.1

Merge branch 'MDL-42392-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit f0d61c012de4bce25d79b3adcc5fe9eae560ddb6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 06:38:28 +0800
Tag:    v2.6.1

Merge branch 'MDL-43451-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 93b6f3c79e1dc7c9276d87194c0a7321f0880bdd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Dec 2013 07:46:12 +0800
Tag:    v2.6.1

Merge branch 'w52_MDL-43314_m26_floats' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit a4c14b94cabe8e48f6c1b2c2004e34b2032e5b3f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 23 Dec 2013 07:39:48 +0800
Tag:    v2.6.1

Merge branch 'MDL-43318-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE

commit ae20e634d7200c2e2e6f6013501bea3cb0d5ace1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Dec 2013 09:24:19 +0800
Tag:    v2.6.1

Merge branch 'MDL-43404_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE

commit 04b53e0e0c1ecf73d9fd40c34f8d5f3a4662c2a1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Dec 2013 05:59:14 +0800
Tag:    v2.6.1

Merge branch 'MDL-43025-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE

commit e74f735a99d33426d56f348a8e6dfca50b6f1d83
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 Dec 2013 17:29:34 +0800
Tag:    v2.6.1

Merge branch 'MDL-43306-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE

commit 4701b68a51f1e7cdbe1e69d6299d32f5374221b4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 12 Dec 2013 08:16:38 +0800
Tag:    v2.6.1

Merge branch 'w50_MDL-31410_m26_paypalipn' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 3675c9850668f1e50cc096578c40ba042489a174
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 11 Dec 2013 06:31:51 +0800
Tag:    v2.6.1

Merge branch 'MDL-42625_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE

commit 6085ca703d17a06aee6b9ba30a299b783c155f0c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 11 Dec 2013 05:47:29 +0800
Tag:    v2.6.1

Merge branch 'wip-MDL-43150-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

commit 8a630a771cb76678ff7d8337a1130162f190c8f6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 11 Dec 2013 05:13:17 +0800
Tag:    v2.6.1

Merge branch 'wip-MDL-42174-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

commit 409e4794d7eabd2d1c224baee80ee8cc4e149d6e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 11 Dec 2013 02:46:31 +0800
Tag:    v2.6.1

Merge branch '26STABLE-wip-MDL-43135' of https://github.com/jennymgray/moodle into MOODLE_26_STABLE

commit f37e3f357d4f53213af47fba8bbd3a5e855757d7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 09 Dec 2013 23:24:35 +0800
Tag:    v2.6.1

Merge branch 'MDL-40003-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE

commit ac184c9db2805a7ddfcedaff28f6988d2a115cb3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Dec 2013 06:55:49 +0800
Tag:    v2.6.1

Merge branch 'MDL-41446-master' of git://github.com/sammarshallou/moodle into MOODLE_26_STABLE

commit 786f04f485b06a678c9c84e283800604af4aa73e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Dec 2013 06:41:24 +0800
Tag:    v2.6.1

Merge branch 'MDL-43142_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE

commit 310cf52b37dcf2351bb65894456e8f2372b1cb1b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Dec 2013 06:25:33 +0800
Tag:    v2.6.1

Merge branch 'MDL-43140_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE

commit b5036ee20cf4235f855d11a038f1fa1f43392f72
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Dec 2013 02:33:30 +0800
Tag:    v2.6.1

Merge branch 'wip-MDL-43058-26' of git://github.com/abgreeve/moodle into MOODLE_26_STABLE

commit 1abaa0c22ea32311ade9afe818f7e6ab7ca5da9b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Dec 2013 02:16:08 +0800
Tag:    v2.6.1

Merge branch 'MDL-43105-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 9a734d1862445a1c82803a3095788f139e2d6d69
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Dec 2013 00:18:02 +0800
Tag:    v2.6.1

Merge branch 'moodle26-mdl33971' of https://github.com/tlock/moodle into MOODLE_26_STABLE

commit b470112643a3bd559879b5f2e3724ed9ea6f2862
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Dec 2013 17:01:43 +0800
Tag:    v2.6.1

Merge branch 'MDL-42885_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE

commit d6ece9f7f0f931a4427bfbc762e8629fd1297b31
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 28 Nov 2013 19:44:13 +0800
Tag:    v2.6.1

Merge branch 'MDL-42957-26' of https://github.com/jamiepratt/moodle into MOODLE_26_STABLE

commit a01d727a311b1fa60b37983dcdee7f3c74bf7872
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Nov 2013 04:28:25 +0800
Tag:    v2.6.1

Merge branch 'm26_MDL-43045' of git://github.com/totara/moodle into MOODLE_26_STABLE