Git merges in Moodle 2.5.4 by Sam Hemelryk
commit ba5255f4f17fcc759070add6aaa1bcc94e6399a9
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 06 Jan 2014 06:28:10 +0800
Tag: v2.5.4
Merge branch 'MDL-35973_redirect_25' of https://github.com/andyjdavis/moodle into MOODLE_25_STABLE
commit 8a89a476e7a08d6bc3d4cb512aa9928951e0945f
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 06 Jan 2014 06:21:42 +0800
Tag: v2.5.4
Merge branch 'MDL-43281-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE
commit bf78d33216903b56cea52f78c4f2f7319249f5c5
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 06 Jan 2014 06:17:58 +0800
Tag: v2.5.4
Merge branch 'MDL-37962_beep_25' of https://github.com/andyjdavis/moodle into MOODLE_25_STABLE
commit 4c852874d197ac273d6c539cad656d2491793281
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 06 Jan 2014 06:13:55 +0800
Tag: v2.5.4
Merge branch 'MDL-43530-25' of https://github.com/mr-russ/moodle into MOODLE_25_STABLE
commit 871b85e8cf2aed64837fbb1c3f529eec3eec872c
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 06 Jan 2014 05:30:02 +0800
Tag: v2.5.4
Merge branch 'MDL-42212-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE
commit 9caa330e56d68e15d884a3416197844e743f00ab
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 24 Dec 2013 12:17:40 +0800
Tag: v2.5.4
Merge branch 'install_25_STABLE' of git://git.moodle.org/moodle-install into MOODLE_25_STABLE
commit 986e4f6720f85287b53c7a2767358498e51883a3
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 24 Dec 2013 07:51:50 +0800
Tag: v2.5.4
Merge branch 'wip-MDL-41788_M25_3' of git://github.com/gjb2048/moodle into MOODLE_25_STABLE
commit 5d10a4c6908b71709a865e62ea98c4db28e23a6a
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 24 Dec 2013 06:41:23 +0800
Tag: v2.5.4
Merge branch 'MDL-41246-moodle25' of git://github.com/StudiUM/moodle into MOODLE_25_STABLE
commit 1d5e5cc670f48733a2c1243d6c6fc206aa218f82
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 24 Dec 2013 06:22:53 +0800
Tag: v2.5.4
Merge branch 'MDL-43438-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE
commit 77104a2bd2678b10139aa6f9e28677d2ac33cb84
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 24 Dec 2013 05:51:00 +0800
Tag: v2.5.4
Merge branch 'MDL-43250-25' of git://github.com/damyon/moodle into MOODLE_25_STABLE
commit c7f13ceafc1efa808b89f7365f639990813cc0a9
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 23 Dec 2013 10:57:36 +0800
Tag: v2.5.4
Merge branch 'MDL-35032-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE
commit 7eba9ea8992e51947db267191cfda1a6c1616b65
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 23 Dec 2013 09:35:16 +0800
Tag: v2.5.4
Merge branch 'MDL-30195-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE
commit 3aba4d0f12be138842f343083c777bb96bfb001e
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 23 Dec 2013 09:31:29 +0800
Tag: v2.5.4
Merge branch 'w52_MDL-43367_m25_contextpath' of https://github.com/skodak/moodle into MOODLE_25_STABLE
commit d071a951e14251fd1e6fb5c25e4bfe48bb277291
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 23 Dec 2013 03:15:57 +0800
Tag: v2.5.4
Merge branch 'MDL-34182-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE
commit 3dc592815af9ee069eaa5a5b444be3c8467b7853
Author: Sam Hemelryk <sam@moodle.com>
Date: Thu, 19 Dec 2013 12:01:04 +0800
Tag: v2.5.4
Merge branch 'MDL-40750-25-fixup' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE
commit 9f90cd755345942c35514a8b5ce9645a97dee8bf
Author: Sam Hemelryk <sam@moodle.com>
Date: Thu, 19 Dec 2013 04:22:41 +0800
Tag: v2.5.4
Merge branch 'MDL-43235_25-extrafix' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE
commit f6c3162520a51cc802f879780f9507f1eb2f6bf0
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 18 Dec 2013 06:19:19 +0800
Tag: v2.5.4
Merge branch 'MDL-43235_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE
commit 2f73b98955ec85f6b45c9a4dcdc24dd6add6ff50
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 18 Dec 2013 05:45:13 +0800
Tag: v2.5.4
Merge branch 'MDL-43355_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE
commit 8a0ba53b9c21edc3429389035694b15bde43913e
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 18 Dec 2013 04:21:21 +0800
Tag: v2.5.4
Merge branch 'MDL-38698-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE
commit 32196e43ca16304037fba3f500af401a062fa260
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 18 Dec 2013 04:18:32 +0800
Tag: v2.5.4
Merge branch 'MDL-40750-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE
commit 2a3ce2b33dc1914d3876c3002dc7529e5779e454
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 17 Dec 2013 03:53:57 +0800
Tag: v2.5.4
Merge branch 'MDL-25473-25' of git://github.com/phalacee/moodle into MOODLE_25_STABLE
commit 474a218fc8e8e6616f78de20ecdb70f1196d5789
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 17 Dec 2013 03:47:37 +0800
Tag: v2.5.4
Merge branch 'MDL-34321-25' of git://github.com/phalacee/moodle into MOODLE_25_STABLE
commit 8e4e9d8d6719d95b15f359ccd065a848719f5eb3
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 17 Dec 2013 03:44:42 +0800
Tag: v2.5.4
Merge branch 'MDL-36984-25' of git://github.com/phalacee/moodle into MOODLE_25_STABLE
commit 0c41eeda3a8be83a4a8f5d6153a31c5f340ce626
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 16 Dec 2013 10:43:23 +0800
Tag: v2.5.4
Merge branch 'wip-mdl-21180-m25' of https://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE
commit 92d66ed0bebea5dc50fb69c82820baf8f13a527b
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 16 Dec 2013 09:09:32 +0800
Tag: v2.5.4
Merge branch 'wip-MDL-43348_M25' of git://github.com/gjb2048/moodle into MOODLE_25_STABLE
commit 1ebfb4a6c606d4e6eb246a761fa99cc71bf31149
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 16 Dec 2013 08:51:53 +0800
Tag: v2.5.4
Merge branch 'MDL-40096-25' of git://github.com/damyon/moodle into MOODLE_25_STABLE
commit 960edf3828724e65835be4d22dbed8f4ec8ab63d
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 16 Dec 2013 06:31:02 +0800
Tag: v2.5.4
Merge branch 'MDL-40436-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE
commit 7827adcf282e2f82cfbb9e793cba8cb83eb5657d
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 16 Dec 2013 06:17:33 +0800
Tag: v2.5.4
Merge branch 'w51_MDL-42931_m25_env27' of https://github.com/skodak/moodle into MOODLE_25_STABLE
commit 13ab45efe4e8bf9a0e8b0b299967cd59abe56128
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 16 Dec 2013 06:11:18 +0800
Tag: v2.5.4
Merge branch 'MDL-42085-25' of git://github.com/mouneyrac/moodle into MOODLE_25_STABLE
commit 90dec729a5dcafc4722e21acab7c0c140ab305db
Author: Sam Hemelryk <sam@moodle.com>
Date: Fri, 13 Dec 2013 11:59:23 +0800
Tag: v2.5.4
Merge branch 'install_25_STABLE' of git://git.moodle.org/moodle-install into MOODLE_25_STABLE
commit a458eacede7c13a353c3ab2651d726752ee979a1
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 11 Dec 2013 06:03:14 +0800
Tag: v2.5.4
Merge branch 'MDL-43252-m25' of git://github.com/sammarshallou/moodle into MOODLE_25_STABLE
commit 0dc8e800979f5d28f41488abb2ec708a1c494fdc
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 11 Dec 2013 05:58:31 +0800
Tag: v2.5.4
Merge branch 'wip-MDL-43279-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE
commit 69a40654d85e47f9cfb9bd67489aa3228a4cc56e
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 10 Dec 2013 04:20:17 +0800
Tag: v2.5.4
Merge branch 'm25_MDL-43159_Wrong_Naming_Convention_For_Variable' of https://github.com/scara/moodle into MOODLE_25_STABLE
commit 0da3aac317a6c726c0b303a0f8f151fcaaa5ef34
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 10 Dec 2013 03:47:46 +0800
Tag: v2.5.4
Merge branch 'MDL-43194-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE
commit aa1549681af897c5bd95d8c5298f8ed13fa7bf15
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 10 Dec 2013 03:43:23 +0800
Tag: v2.5.4
Merge branch 'MDL-43152-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE
commit d12121f3856efc891e02cbc386b3f8246fbbc286
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 10 Dec 2013 03:28:56 +0800
Tag: v2.5.4
Merge branch 'm25_MDL-43019' of git://github.com/danmarsden/moodle into MOODLE_25_STABLE
commit c7cde40bb5da19d87a0e8524920b157b05c8ae06
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 04 Dec 2013 06:52:23 +0800
Tag: v2.5.4
Merge branch 'MDL-41592_25' of https://github.com/dmonllao/moodle into MOODLE_25_STABLE
commit d653c838b0d7547740c2f6a63ef2c7616d8dd603
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 04 Dec 2013 05:11:51 +0800
Tag: v2.5.4
Merge branch 'MDL-43093_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE
commit f591b27e11ebcfce7a62fd52d4ac74f58c1deb03
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 03 Dec 2013 04:57:25 +0800
Tag: v2.5.4
Merge branch 'w48_MDL-41819_m25_maxinputvars' of https://github.com/skodak/moodle into MOODLE_25_STABLE
commit 4cedd8fb9da1f9d174dec90612552fcabe5c95ff
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 26 Nov 2013 03:42:02 +0800
Tag: v2.5.4
Merge branch 'MDL-43005-25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE
commit 4f314c0d62dcad486727b78cf3e5a18dadd92130
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 19 Nov 2013 07:27:55 +0800
Tag: v2.5.4
Merge branch 'MDL-41316-25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE
commit b85181b3cd8ab13ef5557fcb9194a9eeb28305f1
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 19 Nov 2013 07:24:28 +0800
Tag: v2.5.4
Merge branch 'w47_MDL-42612_m25_paypalruble' of https://github.com/skodak/moodle into MOODLE_25_STABLE
commit d9ca430e4fec15f4f6a55f8af4c441f2222ebeb6
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 19 Nov 2013 07:06:08 +0800
Tag: v2.5.4
Merge branch 'MDL-42774-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE
commit 37c71ce3cc54ce126e6778dc6e360e12eecac3cc
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 19 Nov 2013 07:03:25 +0800
Tag: v2.5.4
Merge branch 'MDL-42863_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE
commit a073d7c8b0222f162da3d7177b1d91f036a65152
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 19 Nov 2013 06:50:32 +0800
Tag: v2.5.4
Merge branch 'MDL-42865_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE
commit 31767636d8630d2be8335964b1b5cfeacd08755b
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 19 Nov 2013 06:43:42 +0800
Tag: v2.5.4
Merge branch 'wip-MDL-42852_M25' of git://github.com/gjb2048/moodle into MOODLE_25_STABLE
commit ca8790e981d8b6948dd063fea8b991dd648e0da3
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 19 Nov 2013 05:13:13 +0800
Tag: v2.5.4
Merge branch 'MDL-42184-25' of git://github.com/mouneyrac/moodle into MOODLE_25_STABLE
commit 5b8ead0e73f021156cbe7bd8bb96d3a824f7ef15
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 19 Nov 2013 05:08:05 +0800
Tag: v2.5.4
Merge branch 'MDL-42853-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE
commit 36c192677e8408660326a4e365595ee146f8664a
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 11 Nov 2013 14:09:54 +0800
Tag: v2.5.4
Merge branch 'wip-mdl-42795-m25' of https://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE