Git merges in Moodle 2.3.7 by Eloy Lafuente (stronk7)

commit f26acbbf5b3465ea028c6962cbefffe648adb05d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 13 May 2013 17:53:25 +0800
Tag:    v2.3.7

Merge branch 'MDL-39642-en_fix-23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE

commit 13a322f4b6c8fc8aeee8306b8577efe45176fe4b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 23:18:12 +0800
Tag:    v2.3.7

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit 2e97c22310d862d0c13d31b2cb76b54ca54508cf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 19:18:18 +0800
Tag:    v2.3.7

Merge branch 'MDL-39518-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

commit f6735ae534461693861cddc81ecdbab67e982359
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 09:17:55 +0800
Tag:    v2.3.7

Merge branch 'MDL-38885-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 48265a65497ba3354960ee86021342ed31cdc84d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 08:54:33 +0800
Tag:    v2.3.7

Merge branch 'MDL-29758_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE

commit 6185fa79e7d3730e09f29da70d58ee0ca3ac1d8b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 09 May 2013 21:49:33 +0800
Tag:    v2.3.7

Merge branch 'MDL-39488_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit 7f8cc6f777ff9dc351c07946b00186e95898da22
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 09 May 2013 06:55:28 +0800
Tag:    v2.3.7

Merge branch 'MDL-38487_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit c6b1ff865fa8b8a5add05fd577b9694db0fe5ee0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 May 2013 01:14:19 +0800
Tag:    v2.3.7

Merge branch 'MDL-34275-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit c738cc946f0b3caf3e26a10ec215713e669d54f7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 May 2013 22:54:06 +0800
Tag:    v2.3.7

Merge branch 'MDL-39444_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 48c8137388dff4156f7dadae34153df1ad0cd134
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 May 2013 07:35:24 +0800
Tag:    v2.3.7

Merge branch 'wip-MDL-39432-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE

commit 4b9ae9e99767819fed1af00caa3be66424e29f37
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 25 Apr 2013 07:03:22 +0800
Tag:    v2.3.7

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit cddf19fccd819ad9a6c8bd06e44b595a195c0f69
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 25 Apr 2013 05:37:17 +0800
Tag:    v2.3.7

Merge branch 'MDL-35364_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit c7ed9140770c5c128eaad5850796f379e51208d3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 15 Apr 2013 07:58:01 +0800
Tag:    v2.3.7

Merge branch 'MDL-39089_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE

commit 2a564dc2bffdaccafe11123302c52c62382f6c96
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Apr 2013 18:33:06 +0800
Tag:    v2.3.7

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit f3d49933b035010cbc5348271a8aa5544701c763
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Apr 2013 06:57:23 +0800
Tag:    v2.3.7

Merge branch 'MDL-38525-23' of https://github.com/damyon/moodle into MOODLE_23_STABLE

commit 679620265af7d2ace4ad167c06cb3eed8ec745b3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 08:25:54 +0800
Tag:    v2.3.7

Merge branch 'w14_MDL-38753_m23_ocicount' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit f3da6ac7aaf532d82b05d351dcc33f60c4fde5a0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 07:40:06 +0800
Tag:    v2.3.7

Merge branch 'MDL-38912_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 1b9d0b9e3ec57c8c1b6851258f9588951a0e6629
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 08 Apr 2013 22:58:03 +0800
Tag:    v2.3.7

Merge branch 'MDL-39023-parentlang_23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE

commit a88b558c834e96ec654134897563d2716706573d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 04 Apr 2013 06:58:39 +0800
Tag:    v2.3.7

Merge branch 'MDL-38112-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit 4984697c122150d2c78ef0c4b171381ca0827e17
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Mar 2013 06:42:11 +0800
Tag:    v2.3.7

Merge branch 'MDL-38557_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit e721f2dec8187ae83676b874b7feca5ed2b9e287
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Mar 2013 06:24:00 +0800
Tag:    v2.3.7

Merge branch 'MDL-38647_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit eea80d257c1ea379fd9f9e5addc2f7ed16d8921f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 25 Mar 2013 06:39:42 +0800
Tag:    v2.3.7

Merge branch 'MDL-36927-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit 3ea063fe7de581b99f46ec7e9de9d8206fdbdf9e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 21 Mar 2013 17:56:31 +0800
Tag:    v2.3.7

Merge branch 'MDL-37664-23-int' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit e8151631620bebb92f44099fc5f4649fc9c70bd3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 07:43:49 +0800
Tag:    v2.3.7

Merge branch 'MDL-38490_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 665f13c50c5e5ce5244849ea8d975ca3201a6e95
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 07:32:09 +0800
Tag:    v2.3.7

Merge branch 'MDL-38370-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit 601054daca081f1bd01f696379419063e3bcea68
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 07:21:58 +0800
Tag:    v2.3.7

Merge branch 'w12_MDL-38364_m23_phpunitloading' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit a3a6b68ae95aa231dae6ceba45a511e528982824
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 06:37:49 +0800
Tag:    v2.3.7

Merge branch 'MDL-37664-MOODLE_23_STABLE' of https://github.com/lucisgit/moodle into MOODLE_23_STABLE

commit c2879b7db8f57ad2e7b46cac644673f19ea4c300
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 06:18:59 +0800
Tag:    v2.3.7

Merge branch 'MDL-38424_m23' of git://github.com/kordan/moodle into MOODLE_23_STABLE

commit 9146ab295da1fc3c1ec004f028a93a49d2ea1800
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 06:13:16 +0800
Tag:    v2.3.7

Merge branch 'MDL-38395_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 14742ceb73ff8603b8cc4cff1e7fcec48c656cc7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 04:17:19 +0800
Tag:    v2.3.7

Merge branch 'MDL-38460_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit 7a4605ae62c82958687cec1239036e9915a8cf47
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 04:13:22 +0800
Tag:    v2.3.7

Merge branch 'wip-MDL-38422_M23' of git://github.com/gjb2048/moodle into MOODLE_23_STABLE

commit e250e9ae299c0a665309ca94b0216112c69363cb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 04:07:29 +0800
Tag:    v2.3.7

Merge branch 'MDL-38363_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit a0b12848a47fec2cc958993dae726213d8d0b717
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 04:01:24 +0800
Tag:    v2.3.7

Merge branch 'MDL-38355_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 07c65a602992e8d607339e168b5c1f2b30b3d96b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 02:03:37 +0800
Tag:    v2.3.7

Merge branch 'MDL-38388_23' of git://github.com/jonof/moodle into MOODLE_23_STABLE

commit 7849c443762e6c2a62abdfdfe969d4ef4276f9ed
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 01:23:04 +0800
Tag:    v2.3.7

Merge branch 'MDL-38412_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit e2c7333c2ed1cc76cbfa82bbcc0870b4b98f655b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 01:18:05 +0800
Tag:    v2.3.7

Merge branch 'w12_MDL-38329_m23_webkit' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit b2b512671d55ae6654896a21c7d8905f0ab681c9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 23:49:45 +0800
Tag:    v2.3.7

Merge branch 'MDL-38542_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 6211a05866d9c15e0a808b83236028e489a6ee35
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 23:35:41 +0800
Tag:    v2.3.7

Merge branch 'MDL-38444_23' of https://github.com/ppichet/moodle into MOODLE_23_STABLE

commit dd8ec000671a79d45dc762af2277b80eda4fc99a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 19:58:42 +0800
Tag:    v2.3.7

Merge branch 'MDL-38515-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE

commit a3db3bfac030abdc32ef851cc6b3651bd637c36e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 19:29:01 +0800
Tag:    v2.3.7

Merge branch 'MDL-38397_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit cf9b57d181c4bb5bd468e8ae6301f1fa7dc5919e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 17:24:45 +0800
Tag:    v2.3.7

Merge branch 'wip-mdl-38431-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit 28896f12f70fcf08ca72c4e45b55b0e36152ef06
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 16:37:31 +0800
Tag:    v2.3.7

Merge branch 'MDL-36872-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE