Git merges in Moodle 2.7.4 by Sam Hemelryk

commit 8d666a615475664d8e84f51d0488e78e2d2a1612
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Dec 2014 04:27:23 +0800
Tag:    v2.7.4

Merge branch 'm27_MDL-48389' of https://github.com/totara/moodle into MOODLE_27_STABLE

commit 903cc3a6a04575bb002e9c4400bf554b52b495fb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Dec 2014 11:57:07 +0800
Tag:    v2.7.4

Merge branch 'wip_MDL-36499_M27' of git://github.com/gjb2048/moodle into MOODLE_27_STABLE

commit 55307e61c6e3defe0461570fa296e743e4e55c89
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Dec 2014 11:20:45 +0800
Tag:    v2.7.4

Merge branch 'wip-MDL-46486-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE

commit 745992c3eefbbbca1aa4eba6400ee08b2d43f35a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Dec 2014 10:58:51 +0800
Tag:    v2.7.4

Merge branch 'MDL-34437-27' of git://github.com/ankitagarwal/moodle into MOODLE_27_STABLE

commit 7bdce11859bbb41d29a92441d75908d2be5a9237
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Dec 2014 10:38:45 +0800
Tag:    v2.7.4

Merge branch 'm27_MDL-46172' of https://github.com/greg-or/moodle-mod_assign into MOODLE_27_STABLE

commit dd818b9b174989a471c5df8e0f6641da6c414cb4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Dec 2014 10:15:56 +0800
Tag:    v2.7.4

Merge branch 'mdl48517_27' of https://github.com/tlevi/moodle into MOODLE_27_STABLE

commit 0f5ebed1b7169fe578dadaab7fccdd2cc5e2a96f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Dec 2014 08:43:34 +0800
Tag:    v2.7.4

Merge branch 'wip-MDL-48366-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE

commit 5e9b48a351a0e33088dca22743f37bb41ae075b2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Dec 2014 07:13:32 +0800
Tag:    v2.7.4

Merge branch 'wip-mdl-48426-m27' of https://github.com/rajeshtaneja/moodle into MOODLE_27_STABLE

commit dc0d55a1aa8bc692fe27d2fe82e3b98c6f73dfc2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Dec 2014 09:50:57 +0800
Tag:    v2.7.4

Merge branch 'MDL-37704-27' of git://github.com/ankitagarwal/moodle into MOODLE_27_STABLE

commit 3bc123b2fda83a75b7c0fcd6106fc11f18fc4c62
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Dec 2014 08:58:20 +0800
Tag:    v2.7.4

Merge branch 'MDL-48058-27' of git://github.com/andrewnicols/moodle into MOODLE_27_STABLE

commit 21174ebcc12d327695c04993ca4194bdb24d4631
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 03 Dec 2014 03:35:18 +0800
Tag:    v2.7.4

Merge branch 'M27_MDL46116_IMSCP_container_items.updates_2014-11-11' of https://github.com/Dave-B/moodle into MOODLE_27_STABLE

commit 36f4c617b1c3c5cbd46964a8c17b1b389047c6d7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Dec 2014 05:03:04 +0800
Tag:    v2.7.4

Merge branch 'MDL-40419-27-2nd' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit 545d15da8ee4db7db4a8640a7f9b09a579b207fc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 09:02:12 +0800
Tag:    v2.7.4

Merge branch 'wip-MDL-48377-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE

commit 90254c5b6caa14b4d2e6439d26aaf779e6ea5de3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 08:58:17 +0800
Tag:    v2.7.4

Merge branch 'MDL-48382_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit 56204564e5c4423ecc7e891ca9f69284ecc69b1a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 06:59:32 +0800
Tag:    v2.7.4

Merge branch 'MDL-46618_m27' of git://github.com/kordan/moodle into MOODLE_27_STABLE

commit 2f0a90c22f6a5c016ef5ed08c7c7296178f282e0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 06:35:49 +0800
Tag:    v2.7.4

Merge branch 'MDL-14402-27' of git://github.com/andrewnicols/moodle into MOODLE_27_STABLE

commit eeab296542737a96f11ee03e10bdd92dfcbfc47b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 06:31:33 +0800
Tag:    v2.7.4

Merge branch 'MDL-48384-27' of git://github.com/danpoltawski/moodle into MOODLE_27_STABLE

commit 6fae37e111a3ec81c8ef1485f8ef492e7b8aead8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 05:19:27 +0800
Tag:    v2.7.4

Merge branch 'MDL-47133-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit d5f17c854b427ab1acad2d474cdbaab66b306e11
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Nov 2014 03:43:34 +0800
Tag:    v2.7.4

Merge branch 'MDL-47329-27' of git://github.com/jethac/moodle into MOODLE_27_STABLE

commit b15c43b1973e885a29743cafa2a0778e6384b6a3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Nov 2014 10:54:16 +0800
Tag:    v2.7.4

Merge branch 'MDL-22043-27' of git://github.com/andrewnicols/moodle into MOODLE_27_STABLE

commit 76a3bfec12603301ea03beef39b6d24a54460516
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Nov 2014 10:47:57 +0800
Tag:    v2.7.4

Merge branch 'MDL-46534-27' of git://github.com/andrewnicols/moodle into MOODLE_27_STABLE

commit 70554009a399d0c289d5022e7f0f687437089cc8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Nov 2014 09:07:16 +0800
Tag:    v2.7.4

Merge branch 'MDL-23839-27' of git://github.com/andrewnicols/moodle into MOODLE_27_STABLE

commit 06b1368f883e1b9c8f66ca18cf9d9cd88df27ecb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Nov 2014 07:29:01 +0800
Tag:    v2.7.4

Merge branch 'MDL-23912-27' of git://github.com/jethac/moodle into MOODLE_27_STABLE

commit 0db7d1b6a25aaffe722970510aa36b6001338797
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Nov 2014 05:52:52 +0800
Tag:    v2.7.4

Merge branch 'MDL-48246-M27' of git://github.com/lazydaisy/moodle into MOODLE_27_STABLE

commit 7d6ac9b85f04ca1fb129e62109c5f159dc33e64f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Nov 2014 04:42:51 +0800
Tag:    v2.7.4

Merge branch 'm27_MDL-48265' of https://github.com/totara/moodle into MOODLE_27_STABLE

commit 14eec5af8f0f5be76662ce4f9936a39451795d11
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Nov 2014 09:54:21 +0800
Tag:    v2.7.4

Merge branch 'MDL-48064-m27-master' of https://github.com/dthies/moodle into MOODLE_27_STABLE

commit f9ed19e476fc63e4280951bbf11f51370ac77bcc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Nov 2014 05:06:04 +0800
Tag:    v2.7.4

Merge branch 'MDL-35494_m27' of https://github.com/markn86/moodle into MOODLE_27_STABLE

commit 0391103027552155750b9473faf59a71246c5996
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 19 Nov 2014 04:37:21 +0800
Tag:    v2.7.4

Merge branch 'MDL-33606_27' of git://github.com/dmonllao/moodle into MOODLE_27_STABLE

commit f51988665f73ff2b0c42bc13444022eea53c4683
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Nov 2014 12:38:03 +0800
Tag:    v2.7.4

Merge branch 'wip-mdl-48250-m27' of https://github.com/rajeshtaneja/moodle into MOODLE_27_STABLE

commit ecda42ce1f00104d8cd36d460fdcf7cd48d4487a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Nov 2014 11:47:27 +0800
Tag:    v2.7.4

Merge branch 'MDL-29585-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit 2337865922ebafce9b3937d15b03d9ebc331c90d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Nov 2014 06:12:30 +0800
Tag:    v2.7.4

Merge branch 'MDL-47618_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit d02d0a4f31aa4c0819e9e2280983d6e5b301f958
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 09:37:53 +0800
Tag:    v2.7.4

Merge branch 'MDL-48115_27' of https://github.com/totara/openbadges into MOODLE_27_STABLE

commit 88aefc4910194bb0269f36b9a8dc2d074bd3c311
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 08:39:13 +0800
Tag:    v2.7.4

Merge branch 'MDL-48194-27' of git://github.com/andrewnicols/moodle into MOODLE_27_STABLE

commit 399e3f33a1d32ef1dffc674c867cac3f9b1aeb32
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 07:48:08 +0800
Tag:    v2.7.4

Merge branch 'MDL-48179-m27' of https://github.com/sammarshallou/moodle into MOODLE_27_STABLE

commit d38d8313df7321cfafcfb0deacf16194aec29c2f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 07:34:12 +0800
Tag:    v2.7.4

Merge branch 'MDL-48196-27' of git://github.com/andrewnicols/moodle into MOODLE_27_STABLE

commit 6769628da604bce4cfe55541ae68ca0ba6a345eb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 06:50:50 +0800
Tag:    v2.7.4

Merge branch 'm27_MDL-47993' of https://github.com/totara/moodle into MOODLE_27_STABLE

commit fbcf4385a4aa081ccb3dcd4b20d6416708c050ba
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 04:50:35 +0800
Tag:    v2.7.4

Merge branch 'MDL-35638-27' of git://github.com/ankitagarwal/moodle into MOODLE_27_STABLE

commit 7a7ad4e500836675a48a8d3ad52611549efbb9e0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 04:46:38 +0800
Tag:    v2.7.4

Merge branch 'MDL-47590_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit 32df8695ba94d164ab3af0f034823e8ac2aa0e0e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 04:34:29 +0800
Tag:    v2.7.4

Merge branch 'MDL-44657-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit ecb90615b853e1c279bcb6ea68b3f73d27b6c1e8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Nov 2014 07:33:43 +0800
Tag:    v2.7.4

Merge branch 'MDL-47391_M27' of github.com:ninelanterns/moodle into MOODLE_27_STABLE

commit 8ed36ec5b0e623753ee18dd8cc70e72d1b532e23
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Nov 2014 04:42:02 +0800
Tag:    v2.7.4

Merge branch 'MDL-39692-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit 5c4f15ae31a68a5a023c5c542c2915579bca59d6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Nov 2014 03:58:58 +0800
Tag:    v2.7.4

Merge branch 'MDL-30968-m27-forum-group-link' of https://github.com/amandadoughty/moodle into MOODLE_27_STABLE