Git merges in Moodle 2.4.7 by Marina Glancy

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

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

commit 794f42d81d825de5a787ce5aeb4a497e5b37c057
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 06 Nov 2013 13:32:39 +0800
Tag:    v2.4.7

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

commit a78bb0cc831812d9963deb29f5b5bae473154d78
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 05 Nov 2013 14:45:38 +0800
Tag:    v2.4.7

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

commit e2fb6ffa24e8ede31ced4c5fa0b9f64bae11e53c
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 16:17:08 +0800
Tag:    v2.4.7

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

commit 9ea075bb322f9fd2c55dbc6db11bfad5c8d88789
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 14:28:34 +0800
Tag:    v2.4.7

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

commit 08839bbcb89c0d3ba97f06186f4c0e2e81870e59
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 14:23:31 +0800
Tag:    v2.4.7

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

commit abfdce235b8a94600d7194c789d4304d79408875
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 13:58:26 +0800
Tag:    v2.4.7

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

commit abaaa8cdae7b7c014b95dcc2c30bdb350b711345
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 13:15:13 +0800
Tag:    v2.4.7

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

commit 9312fbe16e8d8a591a61e673921ac5a536b78d93
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 12:19:00 +0800
Tag:    v2.4.7

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

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

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

commit accfa102fe218579a3aaaa675a67b7a175573638
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 31 Oct 2013 19:20:20 +0800
Tag:    v2.4.7

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

commit 91d309074f0c93ff81c41290c70f878ad91226d3
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 31 Oct 2013 18:17:28 +0800
Tag:    v2.4.7

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

commit 94cc2c769cfa418c754d349246992586d5adf03c
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 24 Oct 2013 12:31:12 +0800
Tag:    v2.4.7

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

commit e2536570a30f0b296e13170955cce82c8ccd9298
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Oct 2013 07:18:47 +0800
Tag:    v2.4.7

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

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

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

commit f311ba2714994edf07db9646735c6fd8eb18118c
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 22 Oct 2013 11:35:09 +0800
Tag:    v2.4.7

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

commit 06032cd9280835c5dac7f383e25b275241519094
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 22 Oct 2013 11:09:05 +0800
Tag:    v2.4.7

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

commit a322a0ab53aa4423a204a1ff587c54cfed2a3ae4
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 21 Oct 2013 13:00:53 +0800
Tag:    v2.4.7

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

commit d2ff78d1736a30a578e5281a03310f9fb140ba25
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 15 Oct 2013 11:11:58 +0800
Tag:    v2.4.7

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

commit 7bd19d562dce619a3ec52974e1e7a3c418e0b28f
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 10 Oct 2013 09:53:27 +0800
Tag:    v2.4.7

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

commit b159b572078819f2a54867b1e0664b4efdb398e6
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Oct 2013 09:04:12 +0800
Tag:    v2.4.7

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

commit d7788d69f63fced62782069e4680099c688417df
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Oct 2013 18:49:41 +0800
Tag:    v2.4.7

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

commit a033a6b4c1eb3a286e1fc92658d16a0a8fb851fe
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Oct 2013 18:44:07 +0800
Tag:    v2.4.7

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

commit 29d526b49558968b263e5a1e0ac83b65bc4f0e29
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 30 Sep 2013 14:11:44 +0800
Tag:    v2.4.7

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

commit 06450ed3985fc21888c100a51eaddb16e6d3108a
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 27 Sep 2013 12:49:38 +0800
Tag:    v2.4.7

Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE

commit 8492c192afbea22859a81eb6190da69efa8396d0
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Sep 2013 19:33:12 +0800
Tag:    v2.4.7

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

commit b0124c9703280038b67ccc8c221c2bb1bada9ea2
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 23 Sep 2013 17:18:05 +0800
Tag:    v2.4.7

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

commit 47ba8d481e4748065c11fe4fe376f326f746db57
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 23 Sep 2013 12:41:22 +0800
Tag:    v2.4.7

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