Git merges in Moodle 2.6.1 by Sam Hemelryk

commit 0cb1903bfd7027e5ce5b62a95aa8c2baf54bcb0a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 06:28:25 +0800
Tag:    v2.6.1

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

commit 8571b889f37c13a77cdc4cbd68797c2cc18012ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 06:22:09 +0800
Tag:    v2.6.1

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

commit ec9f2a7d3f10bd9582d860ff13fcc871199443a6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 05:30:13 +0800
Tag:    v2.6.1

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

commit 97e9098927830a68b75aa3964f1b242c5c09d2c3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 05:20:39 +0800
Tag:    v2.6.1

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

commit 910dc3393cf3cd05c98182bb9a5aa0c0d66d977d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 12:17:46 +0800
Tag:    v2.6.1

Merge branch 'install_26_STABLE' of git://git.moodle.org/moodle-install into MOODLE_26_STABLE

commit 5ac473e356d45d64053edc4c7853d606b7227216
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 07:52:02 +0800
Tag:    v2.6.1

Merge branch 'wip-MDL-41788_M26_3' of git://github.com/gjb2048/moodle into MOODLE_26_STABLE

commit 10beedc18fac2e58f90b5786d37eb3bf94fc5160
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 06:41:32 +0800
Tag:    v2.6.1

Merge branch 'MDL-41246-moodle26' of git://github.com/StudiUM/moodle into MOODLE_26_STABLE

commit 83797afa91f6baaf6403ba5e01def69dcfff6d36
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 06:23:06 +0800
Tag:    v2.6.1

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

commit d3220e229efa591bf25d6374bc5c40a838b8dc70
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 05:44:04 +0800
Tag:    v2.6.1

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

commit f2b1768da677d0d3dccef8add3d196246a69c978
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 04:12:47 +0800
Tag:    v2.6.1

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

commit 1c5052e29fdb5b22ebf1f056327ce91104b5127f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 10:57:49 +0800
Tag:    v2.6.1

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

commit 61dde025a16de04aed8703f8d267ba1e7dd529e7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 09:35:07 +0800
Tag:    v2.6.1

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

commit b10fec175071ebe99c34822e0103187d3eaee278
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 09:31:50 +0800
Tag:    v2.6.1

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

commit 2347fe54507776a201741ae541d48b4acdb21556
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 03:50:48 +0800
Tag:    v2.6.1

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

commit 43d6e05c24d85c30d17c4392498de32e81e71b2f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 03:16:23 +0800
Tag:    v2.6.1

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

commit 12c847fed95be78ad0e1f624542b1e04cb2e6774
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 06:19:26 +0800
Tag:    v2.6.1

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

commit 6a8e8ac25ede25224f0b0bcb2dc77f43fee2433c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 05:45:02 +0800
Tag:    v2.6.1

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

commit f01cac675a1bdee1c7d65011c8024ce16b3a6c3f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 04:58:51 +0800
Tag:    v2.6.1

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

commit 3aa576a8ef7087e203cf5ecc15ab6cf1d42f69f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 04:21:31 +0800
Tag:    v2.6.1

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

commit 21bb4f142c84866054e8fa35f8f971d7df363678
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:54:22 +0800
Tag:    v2.6.1

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

commit 7809633d79c37a6c3a81242c69dda5adaa7038a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:47:51 +0800
Tag:    v2.6.1

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

commit 7f574aadffc47a4d8f7f404d67ba08816cfce8f3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:44:52 +0800
Tag:    v2.6.1

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

commit 9c099d21eb9952025b28cd414f458e795405a2a7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:24:52 +0800
Tag:    v2.6.1

Merge branch 'w51_MDL-43268_m26_filternotice' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit a3a8490d3a8779b62a29fb7ed324d09aa359b9f9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 10:43:47 +0800
Tag:    v2.6.1

Merge branch 'wip-mdl-21180-m26' of https://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE

commit e9623e55e31a30eb888b734a768f92811fa0aabc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 10:40:25 +0800
Tag:    v2.6.1

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

commit e646b89f8b83a41eda7e413f744a8e6cf64857b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 09:09:52 +0800
Tag:    v2.6.1

Merge branch 'wip-MDL-43348_M26' of git://github.com/gjb2048/moodle into MOODLE_26_STABLE

commit a0f5d96f1e44b1cffe8081632c36b6d0575968a7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 08:52:03 +0800
Tag:    v2.6.1

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

commit 45c058331283a707f965648923b28bc8ad23aa2a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 06:31:13 +0800
Tag:    v2.6.1

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

commit 05a423d850b2c47eb3319592da483a4f31e39e02
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 06:17:46 +0800
Tag:    v2.6.1

Merge branch 'w51_MDL-42931_m26_env27' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 12869bfdb12649b0793a27d19e699366cf6e1148
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 06:11:26 +0800
Tag:    v2.6.1

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

commit 909f01f17ec13117216604d0e62ff3dcc211e204
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 04:46:32 +0800
Tag:    v2.6.1

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

commit 40d3bc442fba7a6af145a457dc54dad3818dc576
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 13 Dec 2013 11:59:31 +0800
Tag:    v2.6.1

Merge branch 'install_26_STABLE' of git://git.moodle.org/moodle-install into MOODLE_26_STABLE

commit 5fbc32ebdbdad279c6731b6f9b8c1bc1aea53124
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 06:12:55 +0800
Tag:    v2.6.1

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

commit 9f00dabf864562889491014344d8b1f000a21c22
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 06:03:23 +0800
Tag:    v2.6.1

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

commit 51d311f703f2c9fd146d7b25dd2dc7306102ff89
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 05:58:49 +0800
Tag:    v2.6.1

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

commit 3ef86b39098ea54f8d869a7493ec6ccb746b0c98
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 05:51:21 +0800
Tag:    v2.6.1

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

commit bdb2677b79250de4f8f14cd891cc5b6905bb245d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 05:34:04 +0800
Tag:    v2.6.1

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

commit e5bb9741b646b2fece10177c19dc75e1a9557a12
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 04:50:27 +0800
Tag:    v2.6.1

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

commit c7f545bbb0dd713e063df5738c8e497ea563a8c9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 04:20:33 +0800
Tag:    v2.6.1

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

commit b2a803d5d1620641c16b35ceb81b4df194ae4917
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 03:48:04 +0800
Tag:    v2.6.1

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

commit 8eb717f9936970bfbc55e4895cc0d7541056b16f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 03:43:36 +0800
Tag:    v2.6.1

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

commit 8e60097af88ff17a5f4e739882889c6d48202c59
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Dec 2013 06:52:18 +0800
Tag:    v2.6.1

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

commit f5a134213d18812576a75109b565a5a21a94344c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Dec 2013 04:43:24 +0800
Tag:    v2.6.1

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

commit 7ac957682535fdf3d40ec719ad67e0ebed9c18c0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Dec 2013 04:42:34 +0800
Tag:    v2.6.1

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

commit 1cb0536bcb106f0686fecdd1cded0a3331e1c545
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Dec 2013 04:58:10 +0800
Tag:    v2.6.1

Merge branch 'w48_MDL-41819_m26_maxinputvars' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit f098ca6d97808ceabfff929218a2bcc19f9e1ca0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Dec 2013 08:39:51 +0800
Tag:    v2.6.1

Merge branch 'MDL-42918_m26' of git://github.com/rwijaya/moodle into MOODLE_26_STABLE

commit 390896d3d95671a670a58172aafdfdcf8f038509
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 26 Nov 2013 03:36:09 +0800
Tag:    v2.6.1

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

commit a34073eeb886694dc207e51b219ab1f475a0849e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 07:24:41 +0800
Tag:    v2.6.1

Merge branch 'w47_MDL-42612_m26_paypalruble' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 64b4fbebd85a3155c234abd046efe65e9e5925aa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 05:09:18 +0800
Tag:    v2.6.1

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