Git merges in Moodle 2.3.3 by Eloy Lafuente (stronk7)

commit 92e9c3d09f1a2a1e36356d3da3c776601f9cdc2e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 15 Oct 2012 06:07:39 +0800
Tag:    v2.3.3

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

commit f2c33d0b69a5d49781c0ce21fc4df98e8e2c362d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 12 Oct 2012 08:18:03 +0800
Tag:    v2.3.3

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

commit 5ba6db698d7f4ed6b587df5a32c4e243064fa4e3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Oct 2012 07:54:17 +0800
Tag:    v2.3.3

Merge branch 'MDL-35715-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE

commit 5553d3d60f786c70577cac0d9da82d669fcde9d3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 17:58:35 +0800
Tag:    v2.3.3

Merge branch 'w41_MDL-35898_m23_coursereset' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit f5ba035015d726a249c508bc5abe0d6ae5826dc9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 07:38:22 +0800
Tag:    v2.3.3

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

commit 5cb3d27681a279237820cc0c8b084c85a211cfb0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 06:47:11 +0800
Tag:    v2.3.3

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

commit 57ca2e437569d8e07e42bbb40d5dd948210f636a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 06:40:14 +0800
Tag:    v2.3.3

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

commit 2689298c8f2b4f31a32839da1439279456ba5b29
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 06:26:49 +0800
Tag:    v2.3.3

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

commit 859d84062702d2acd4a9de66c5cce29da5137f87
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 06:08:26 +0800
Tag:    v2.3.3

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

commit 8b1cb823ded4d15bc69f60247a7a796bfc2219c9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 05:57:11 +0800
Tag:    v2.3.3

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

commit 3e0e4917d8c7647dd433bdf9ba8ac07519555821
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 05:54:51 +0800
Tag:    v2.3.3

Merge branch 'w41_MDL-35382_m23_reordertest' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 7516f96676860e48fbf5c2233109ce704ab8e829
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 05:08:02 +0800
Tag:    v2.3.3

Merge branch 'MDL-35519_book_cancel_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit 85b1e9785777fb301e22676449dc837f968fd256
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 04:52:12 +0800
Tag:    v2.3.3

Merge branch 'w41_MDL-35714_m23_testgc' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 035997329ae28551befd6b520ad1741d7444f0d7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 05 Oct 2012 19:33:02 +0800
Tag:    v2.3.3

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

commit a8d7f5cf15a8c47ec904511a329d71ca813a663a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Oct 2012 06:40:35 +0800
Tag:    v2.3.3

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

commit 9228a5d347eb5fdbd2713374137984e4f7cf79da
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Oct 2012 03:40:58 +0800
Tag:    v2.3.3

Merge branch 'm23_MDL-35227' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

commit fc0f1c3cbca4598b6a49d7d81b6f609166dfae47
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Oct 2012 02:28:13 +0800
Tag:    v2.3.3

Merge branch 'm23_MDL-35557' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

commit 0a7db801f35444dfa28afe185e2d3c7a6819dd53
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Oct 2012 21:59:09 +0800
Tag:    v2.3.3

Merge branch 'm23_MDL-35562' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

commit 50e8e4d00b5d1a930194df6678c115eb0cd58b14
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 01 Oct 2012 19:37:12 +0800
Tag:    v2.3.3

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

commit aa63be7f5f4bef66f7c1f972007ef5c3e4ba40ea
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 01 Oct 2012 19:19:22 +0800
Tag:    v2.3.3

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

commit 4df574f9e545849df20fc3aa61ba17f5e0c1112f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 01 Oct 2012 19:10:06 +0800
Tag:    v2.3.3

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

commit 198178ff2a64ae8d5f1cced37f99c4b632f3b756
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 01 Oct 2012 18:46:26 +0800
Tag:    v2.3.3

Merge branch 'MDL-35644-MOODLE_23_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE

commit 35e19e2acd8b241bf39d4fac8162144333e6599c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 01 Oct 2012 17:08:14 +0800
Tag:    v2.3.3

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

commit e6084683c8b7ef6fe215a3950c9b618b071a67ad
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Sep 2012 06:39:08 +0800
Tag:    v2.3.3

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

commit b437a680d2dc609b9940912ffcd6d250699f0804
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Sep 2012 02:06:03 +0800
Tag:    v2.3.3

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

commit 631aedabb4f1e656ac401a5fa1f8bc45deb3a297
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Sep 2012 01:51:38 +0800
Tag:    v2.3.3

Merge branch 'w38_MDL-32572_m23_authdbduplicates' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 0671db29cec89fb4ecd4763699185d577e42f250
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Sep 2012 07:53:50 +0800
Tag:    v2.3.3

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

commit c59d51b67dab288a52ddf623dbdfc8ebd944be51
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Sep 2012 07:28:46 +0800
Tag:    v2.3.3

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

commit b050380df144673ff3ceb514844618182d4a3c34
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Sep 2012 07:20:45 +0800
Tag:    v2.3.3

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

commit 0f5c4b83976a51176a37743ba83757eb27963e34
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Sep 2012 07:15:31 +0800
Tag:    v2.3.3

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

commit a0a02f4e0d887ac7c0f38aa3d4dabf353af41bad
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Sep 2012 07:12:34 +0800
Tag:    v2.3.3

Merge branch 'w38_MDL-35129_m23_dbmigration' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit b5b8aac98aaa41004eaf422edddfbd9b9d654fd4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 15 Sep 2012 01:03:20 +0800
Tag:    v2.3.3

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

commit bd390545b12602b8c5300be0d5476a08fc996aa0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 12 Sep 2012 23:20:48 +0800
Tag:    v2.3.3

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

commit 65888869651166d5c3b5a56a60a3153585f7a05b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 22:30:44 +0800
Tag:    v2.3.3

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

commit 11a3dd0c0ea58edeed3a1c127c7c6de3e2beaea9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 08:50:29 +0800
Tag:    v2.3.3

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

commit a59f0f25cdfb4e6215a5395764d326fdc2dd0da4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 08:48:22 +0800
Tag:    v2.3.3

Merge branch 'm23_MDL-35156' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

commit 35eb1a0f0cd0161a517734d0b1fe45b621db2312
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 08:44:56 +0800
Tag:    v2.3.3

Merge branch 'MDL-35171_m23' of git://github.com/merrill-oakland/moodle into MOODLE_23_STABLE

commit 2e4678332ac64587a5baf3b236e0802582382d6e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 08:19:48 +0800
Tag:    v2.3.3

Merge branch 'wip-MDL-34338-MOODLE_23_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_23_STABLE

commit c0eee4898a5d7364ec4aec9f19cfbe8a5a146400
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 08:03:10 +0800
Tag:    v2.3.3

Merge branch 'm23_MDL-35123' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

commit 3a3120e2067a765305a6d90103e64170c3e06455
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 07:57:21 +0800
Tag:    v2.3.3

Merge branch 'm23_MDL-35208' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

commit f34cb5797ced98250a499e41ec454104d040073f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 07:53:35 +0800
Tag:    v2.3.3

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

commit 8146d3f12dd5906c9bdfce58600539abfd02bb18
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 07:48:55 +0800
Tag:    v2.3.3

Merge branch 'w37_MDL-35270_m23_oracohort' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit ab88177b5e0d7e8eba3836a8f3222a34f351761e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 01:53:24 +0800
Tag:    v2.3.3

Merge branch 'w37_MDL-35289_m23_tinymcelangs' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit f58585807cfd35076bed05bfa24f8a53408c03c3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 10 Sep 2012 22:41:56 +0800
Tag:    v2.3.3

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