Git merges in Moodle 2.5.3 by Marina Glancy

commit a41b923702befd8621fe067481358db3fdd8228e
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 07 Nov 2013 13:31:22 +0800
Tag:    v2.5.3

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

commit 36c9dadd675f29554e0507cb1c4ababcf3f19b81
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 06 Nov 2013 13:31:46 +0800
Tag:    v2.5.3

Merge branch 'MDL-42640-25' of https://github.com/colin-umn/moodle into MOODLE_25_STABLE

commit 5636172729676070eb119066fdfe57c668fdf138
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 05 Nov 2013 14:45:13 +0800
Tag:    v2.5.3

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

commit bdb51186d75efd7e2f319bf5b3126c83ffaffc31
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 16:16:44 +0800
Tag:    v2.5.3

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

commit a13c26eca36f747951e165199b50a1890cfbdb6b
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 14:28:15 +0800
Tag:    v2.5.3

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

commit 7b6142193d6f736c1edb2d184e97df386274875d
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 14:23:12 +0800
Tag:    v2.5.3

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

commit 01e7a7761958b70b34e0210058cf5c692893146a
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 13:58:11 +0800
Tag:    v2.5.3

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

commit c82257cc8846241d7c506c09afb7e2025cd21392
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 13:14:57 +0800
Tag:    v2.5.3

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

commit b981f1b84711de254208d2e5276f4243779e7ef9
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 12:16:43 +0800
Tag:    v2.5.3

Merge branch 'MDL-38664_m25' of git://github.com/rwijaya/moodle into MOODLE_25_STABLE

commit b5ba65ebf1255e361976d091a656986c80c33b98
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 10:18:15 +0800
Tag:    v2.5.3

Merge branch 'MDL-42664-performance_measuring_filter_manager_25' of git://github.com/mudrd8mz/moodle into MOODLE_25_STABLE

commit 27fa761b1992d056d82b0002cb7c340e21462756
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 31 Oct 2013 19:17:58 +0800
Tag:    v2.5.3

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

commit 42863ec241420e212683eeabbabd8da991ed11c6
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 31 Oct 2013 18:17:08 +0800
Tag:    v2.5.3

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

commit 609aa78de1dedc1c1255c276fbea5cc5d9bdbc7e
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 31 Oct 2013 13:00:16 +0800
Tag:    v2.5.3

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

commit a4b421c1fb8b06e4285ac52bcf1d541693b960f5
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 24 Oct 2013 12:29:57 +0800
Tag:    v2.5.3

Merge branch 'MDL-35402_editor_rules_25' of git://github.com/davosmith/moodle into MOODLE_25_STABLE

commit b46fc7cefd955af0d0c658fc763ce078a98c4c0c
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 24 Oct 2013 11:15:39 +0800
Tag:    v2.5.3

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

commit 538e06f2b5ff424ee33edb39ffb4f711fa3e3dbf
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Oct 2013 07:17:58 +0800
Tag:    v2.5.3

Merge branch 'w43_MDL-37813_m25_filterall' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 265b16589dd75d45c99c97c9aa8d5f45d1715fa5
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 22 Oct 2013 12:04:12 +0800
Tag:    v2.5.3

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

commit b2108d99550f15f0499e466920dfda369e8bd09d
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 22 Oct 2013 11:34:53 +0800
Tag:    v2.5.3

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

commit 575ec94611f8fbec732a0d1a10e85dddfed1e692
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 22 Oct 2013 11:08:45 +0800
Tag:    v2.5.3

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

commit 10ae2a6d0e0b956140f552ae97918e91b1f6d22d
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 21 Oct 2013 13:00:27 +0800
Tag:    v2.5.3

Merge branch 'w43_MDL-42386_m25_etag' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 071ac9ffddbd2d39a0dc6eb6dfdf1513082bd26f
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 15 Oct 2013 11:11:40 +0800
Tag:    v2.5.3

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

commit dd70b2b84adf35e999ea72280e061508ac40d6cf
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 10 Oct 2013 09:53:04 +0800
Tag:    v2.5.3

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

commit 573ceb9459e96f72359a557fc09e3b71eb74305c
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Oct 2013 09:03:48 +0800
Tag:    v2.5.3

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

commit 31f1464297b8c278bd1ecb905a38d429d1f91137
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Oct 2013 18:49:29 +0800
Tag:    v2.5.3

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

commit e4f0750a1287e5185b87a41531ffccd7421683d2
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Oct 2013 18:43:25 +0800
Tag:    v2.5.3

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

commit d23f108197f1a24188ce7927825537c82a428ca4
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 30 Sep 2013 14:10:48 +0800
Tag:    v2.5.3

Merge branch 'MDL-41954-workshop-zero-variance_25' of git://github.com/mudrd8mz/moodle into MOODLE_25_STABLE

commit 9573950b9d7ba4d83edf79c54ce5ae6fe7aaa81a
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 27 Sep 2013 12:51:14 +0800
Tag:    v2.5.3

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

commit 90336898da2ab4e84cc29d02af07ef7786f82be0
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Sep 2013 19:43:18 +0800
Tag:    v2.5.3

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

commit 0184a31bad4ab8e9599fe8da394e156b5f67a812
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Sep 2013 19:32:35 +0800
Tag:    v2.5.3

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

commit 1537f8241eb0b74bb63c32d6c0f13ac2e52ec49e
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 23 Sep 2013 17:17:34 +0800
Tag:    v2.5.3

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

commit 30f43b0e9cd1b44a681e2f6b447e997a360969c7
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 23 Sep 2013 12:40:35 +0800
Tag:    v2.5.3

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

commit eca39eaeee431794148a2909cc1174268fe4f6a3
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 16 Sep 2013 13:32:45 +0800
Tag:    v2.5.3

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