Git merges in Moodle 2.5.3 by Sam Hemelryk

commit 6d50856c1f560e07f3357068328425a7363adcd8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Nov 2013 14:00:19 +0800
Tag:    v2.5.3

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

commit 121de7fe9fee98788aa24a5d5a143deceba1e346
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Oct 2013 15:08:49 +0800
Tag:    v2.5.3

Merge branch 'wip-MDL-42379-25' of git://github.com/abgreeve/moodle into MOODLE_25_STABLE

commit 65c6eb8141ca7100464994136c22e1d466846ec5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Oct 2013 14:19:41 +0800
Tag:    v2.5.3

Merge branch 'MDL-42284_behat_25' of https://github.com/andyjdavis/moodle into MOODLE_25_STABLE

commit 4d5be0764a93df33f8bf126319835dc7bc84e158
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Oct 2013 13:44:48 +0800
Tag:    v2.5.3

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

commit 0460b39c135a09bd152b685b002f7396db9555e2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Oct 2013 08:39:24 +0800
Tag:    v2.5.3

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

commit 9c60ab15139225e574805caf7fdde10fbe46d9a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 Oct 2013 09:39:32 +0800
Tag:    v2.5.3

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

commit 06db3cf3cc2578fd01af4a4e6bbec30095b783f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Oct 2013 03:52:04 +0800
Tag:    v2.5.3

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

commit 2ec16f735aeedefa992d9be4b8467bf5f6bac3cc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Oct 2013 10:39:42 +0800
Tag:    v2.5.3

Merge branch 'MDL-42072_25' of https://github.com/totara/openbadges into MOODLE_25_STABLE

commit c50daf9ae7e33f8322224cb0d34ee3341f9d321e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Oct 2013 08:42:47 +0800
Tag:    v2.5.3

Merge branch 'w41_MDL-41197_m25_convnotices' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 93bf71cd8eb162e1a795b2c8aa6567b8ffb98867
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Oct 2013 07:34:07 +0800
Tag:    v2.5.3

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

commit af911b089a4142d802515b1d2eaee72bec419362
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 04 Oct 2013 10:43:45 +0800
Tag:    v2.5.3

Merge branch 'install_25_STABLE' of git://git.moodle.org/moodle-install into MOODLE_25_STABLE

commit 8c90bbcde00dad229912133ce049f8d0f8234ed9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 09:50:13 +0800
Tag:    v2.5.3

Merge branch 'MDL-41995_m25' of https://github.com/markn86/moodle into MOODLE_25_STABLE

commit ae9f3c0671e448b6485c7fb178fae95142683b3f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 09:35:37 +0800
Tag:    v2.5.3

Merge branch 'MDL-41900-m25' of git://github.com/micaherne/moodle into MOODLE_25_STABLE

commit 82ce52426eae0a2708d0a059dbdeeda3668211ab
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 08:44:54 +0800
Tag:    v2.5.3

Merge branch 'MDL-41894-m25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE

commit b45f2c01c6739570bdffb55493533745e98ef815
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 08:37:29 +0800
Tag:    v2.5.3

Merge branch 'MDL-41228_25' of https://github.com/totara/openbadges into MOODLE_25_STABLE

commit a45ff7d8a6031b13bfa019dbf7939aaa68cc485c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 05:01:16 +0800
Tag:    v2.5.3

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

commit 3f4b04ec3e1efb1d1566c3ab37d2e3b30ec4d989
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 04:53:56 +0800
Tag:    v2.5.3

Merge branch 'MDL-37973_m25' of https://github.com/merrill-oakland/moodle into MOODLE_25_STABLE

commit fea809a7b89ada98cc9a7f508e49f9eaf7ee2ccc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Sep 2013 05:45:44 +0800
Tag:    v2.5.3

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

commit b8cf62bf047a891acaeb4d4f7f1de73d8e4dc71f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Sep 2013 06:18:13 +0800
Tag:    v2.5.3

Merge branch 'MDL-41907_m25' of https://github.com/merrill-oakland/moodle into MOODLE_25_STABLE

commit 72ca4b0acf9d4344ae9650092d37d926031f170e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 05:17:52 +0800
Tag:    v2.5.3

Merge branch 'MDL-40848_m25' of git://github.com/totara/openbadges into MOODLE_25_STABLE

commit 9b70e23754707d7e5483f4858c486db1d43bcad2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 04:32:57 +0800
Tag:    v2.5.3

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

commit 158785810a80f2626ebdb4967bba24d06207a0d5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 20 Sep 2013 10:34:46 +0800
Tag:    v2.5.3

Merge branch 'install_25_STABLE' of git://git.moodle.org/moodle-install into MOODLE_25_STABLE

commit b27ca3514ed22894151f27347d308441834579c1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 04:58:33 +0800
Tag:    v2.5.3

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

commit 6d05276c0203cd1b5831fcecf5b58c25f6310b75
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 04:39:02 +0800
Tag:    v2.5.3

Merge branch 'MDL-38317-moodle25' of git://github.com/StudiUM/moodle into MOODLE_25_STABLE

commit 82dc37c88c23d4bb0835dd4a3a509575a1d638ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 09:55:25 +0800
Tag:    v2.5.3

Merge branch 'MDL-38194-m25' of git://github.com/sammarshallou/moodle into MOODLE_25_STABLE

commit c998a75fdbcf9395418f31d5fd00afb5c0bc1f11
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 09:50:54 +0800
Tag:    v2.5.3

Merge branch 'MDL-41637_25' of https://github.com/totara/openbadges into MOODLE_25_STABLE

commit f534464a060f5bf0cd5c46284edbe1fad503c671
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 06:47:47 +0800
Tag:    v2.5.3

Merge branch 'MDL-41662_25' of https://github.com/totara/openbadges into MOODLE_25_STABLE

commit f8eaa73b4195591d80ae42ff0a20c09663f6d766
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 06:38:34 +0800
Tag:    v2.5.3

Merge branch 'm25_MDL-37524' of git://github.com/danmarsden/moodle into MOODLE_25_STABLE

commit 10c3f9e7e8b155db30f46bbd7eee52b09c331a17
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 06:27:01 +0800
Tag:    v2.5.3

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

commit 8377c04acfcb41a7f34249468ddbf7eddbfa358d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 06:49:53 +0800
Tag:    v2.5.3

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

commit 884d1b2a41de3baae09c8c3c61cfb834b2afe508
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:42:25 +0800
Tag:    v2.5.3

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

commit 7952a767a31e87f0caf50ad1454b2d6a1d461240
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:26:21 +0800
Tag:    v2.5.3

Merge branch 'MDL-41528_MOODLE_25_STABLE' of https://github.com/nitzo/moodle into MOODLE_25_STABLE

commit eb398c5ce60310c7085e5fc04238e65eade6f43d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:20:39 +0800
Tag:    v2.5.3

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

commit 89c92427ad4c8d4939ccb45c046499ec96bee4c3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:00:23 +0800
Tag:    v2.5.3

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

commit c26684b2bed47cc99d56f6e7d2dd47856826b7f0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 04:52:38 +0800
Tag:    v2.5.3

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

commit 492351897d501dff688a094d239eb9228e845f30
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 04:50:50 +0800
Tag:    v2.5.3

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

commit 3f6c2f7de8a69b02af61670b6b0d6cd450c8c973
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 09:11:54 +0800
Tag:    v2.5.3

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

commit 7eb3ddf9b5cabb95c324ea5e996eefa858df02f5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 05:38:35 +0800
Tag:    v2.5.3

Merge branch 'wip-MDL-32862-25' of git://github.com/abgreeve/moodle into MOODLE_25_STABLE

commit eb52eb1df073f030f3b92b488d726b6db3971ce7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 05:35:59 +0800
Tag:    v2.5.3

Merge branch 'MDL-29378-survey-25' of git://github.com/mudrd8mz/moodle into MOODLE_25_STABLE

commit 119bc4adfc86a38d27006c86c350472c3927bc69
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Sep 2013 07:12:23 +0800
Tag:    v2.5.3

Merge branch 'MDL-38794_25' of https://github.com/prateeksachan/moodle into MOODLE_25_STABLE

commit 9691b405fc738ae2757cf993ba55179a9e1812b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Sep 2013 06:51:07 +0800
Tag:    v2.5.3

Merge branch 'MDL-41417_m25' of https://github.com/markn86/moodle into MOODLE_25_STABLE

commit efe6343ee0bdc124094b1c68817f16a59b1844d2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Sep 2013 06:48:37 +0800
Tag:    v2.5.3

Merge branch 'MDL-29378-survey-25' of git://github.com/mudrd8mz/moodle into MOODLE_25_STABLE