Git merges in Moodle 2.1.3 by Eloy Lafuente (stronk7)

commit 64f26a26732250d6d1322f36f8b34d0a7a2a8d88
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 28 Nov 2011 06:40:01 +0800
Tag:    v2.1.3

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 7d93ab41895dee0503ab459574d48d81a14c5727
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 28 Nov 2011 06:18:09 +0800
Tag:    v2.1.3

Merge branch 'dropbox-api-bump-for-21_STABLE' of git://git.luns.net.uk/moodle into MOODLE_21_STABLE

commit cc0988ad2bdbf12eb53d92e4815436ff3e585dce
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 25 Nov 2011 18:05:14 +0800
Tag:    v2.1.3

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 4b67fa946b870565821d0c874b4c127b6d2e53b8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 20:38:40 +0800
Tag:    v2.1.3

Merge branch 'wip-mdl-30394-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit 279fa1b994ac97f9e69e27a4b5552a8e9b49cf48
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 20:28:52 +0800
Tag:    v2.1.3

Merge branch 'wip-mdl-30375-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit 1f8ca423da1573dee05cb265aa81c77fd939b8e3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 19:06:14 +0800
Tag:    v2.1.3

Merge branch 'MDL-29095_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 9e2c51dbf2b38d8a6fc0d2ec16f8a17154e0d8b1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 18:48:13 +0800
Tag:    v2.1.3

Merge branch 'MDL-29060_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 8ed17824f6ad83c6fba54fea32ca8f9680a8dd1d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 18:38:09 +0800
Tag:    v2.1.3

Merge branch 'wip-mdl-28947-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit 5a66a2b9c575db2de53c3bb3da45a1c3e5526ef4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 10:07:25 +0800
Tag:    v2.1.3

Merge branch 'MDL-30042-MOODLE_21_STABLE-1' of git://git.luns.net.uk/moodle into MOODLE_21_STABLE

commit 4df0583e219a1605a1587aea349b461812aa38d7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 10:02:26 +0800
Tag:    v2.1.3

Merge branch 'MDL-27045_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 156ec7701e9858b624c17a113f95a82ea75a7c5b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 08:22:20 +0800
Tag:    v2.1.3

Merge branch 'm21_MDL-30223' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit 30a83348fe5510c4a4d4e10c556dbc26f0033a97
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 08:07:58 +0800
Tag:    v2.1.3

Merge branch 'MDL-30402-install-string_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit f249bab334a1dd9a0cbb30cc3bd49063f51071cb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Nov 2011 02:43:12 +0800
Tag:    v2.1.3

Merge branch 'mdl-23006-xmldb-missing-strings-m21' of git://github.com/sbourget/moodle into MOODLE_21_STABLE

commit b7341aa1360198756989e3167bf0983e7534cc62
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 18 Nov 2011 08:18:14 +0800
Tag:    v2.1.3

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 6c628d482ae56ce85827e8673f9a4f79cdae5a56
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 18 Nov 2011 03:16:13 +0800
Tag:    v2.1.3

Merge branch 'MDL-29350-MOODLE_21_STABLE-2' of git://git.luns.net.uk/moodle into MOODLE_21_STABLE

commit d3606a9a844b886072a37595ec333eb6825e7000
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Nov 2011 08:22:41 +0800
Tag:    v2.1.3

Merge branch 'MDL-29743_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 1e7732cec6654056a06764077d7ef4fa77326c27
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Nov 2011 07:45:28 +0800
Tag:    v2.1.3

Merge branch 'MDL-30069_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 372d9df6506e432f700d0a820d9e91ec7b505591
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Nov 2011 07:35:12 +0800
Tag:    v2.1.3

Merge branch 'MDL-30122_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 71a215991d29cb098352bb94dc0910ba3435ae9c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Nov 2011 07:31:24 +0800
Tag:    v2.1.3

Merge branch 'MDL-30167_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 830969cc63bbb5ae8073e8ecf4119f88fa379a1a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Nov 2011 07:11:02 +0800
Tag:    v2.1.3

Merge branch 'MDL-30186_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 96ec3502f0dfcbe1910f9c8e721bab2b086dfffc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Nov 2011 07:08:40 +0800
Tag:    v2.1.3

Merge branch 'MDL-30199_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 373c70e5d55c7482f4c27564993bc6d3f1a9186a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Nov 2011 07:02:16 +0800
Tag:    v2.1.3

Merge branch 'MDL-30209_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit edfcab2970b89ededdb2ee3247f20e9b01673df4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Nov 2011 06:59:45 +0800
Tag:    v2.1.3

Merge branch 'MDL-30300_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 88f8312aa086af846288a5856d7d53d2e1c5b0ba
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 15 Nov 2011 17:55:11 +0800
Tag:    v2.1.3

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit cd6ac6c8b8a5891deb53cfc1c861d057d0949019
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 Nov 2011 09:43:46 +0800
Tag:    v2.1.3

Merge branch 'MDL-29035-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit 3a2fc5926a0877e995f361f756d323f0de933d01
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 Nov 2011 09:34:16 +0800
Tag:    v2.1.3

Merge branch 'MDL-22351-M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit c35c8eb8e637cb048f7d12f98929312241c098a6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 Nov 2011 08:18:58 +0800
Tag:    v2.1.3

Merge branch 'mdl-29529-assignment-submission-sorting-m21-2' of git://github.com/sbourget/moodle into MOODLE_21_STABLE

commit 0242c9ba9e51d42741d818cc007c8ad41c43593b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 10 Nov 2011 08:54:34 +0800
Tag:    v2.1.3

Merge branch 'MDL-30045' of git://github.com/mouneyrac/moodle into MOODLE_21_STABLE

commit 8ec13b3312f922706951608ac3b52b4a9b9ece1e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 10 Nov 2011 08:33:47 +0800
Tag:    v2.1.3

Merge branch 'MDL-28426_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 147ec85e06c88864bd55bf80fa90e9df55953b50
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 10 Nov 2011 07:22:42 +0800
Tag:    v2.1.3

Merge branch 'MDL-30158-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit 4eeae5a67310c96149d7f6f79d04f4954aa4ee77
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Nov 2011 22:56:26 +0800
Tag:    v2.1.3

Merge branch 'MDL-27542b_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit fe23b6e72f65bc13e351539ce3a3fab08a148021
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Nov 2011 09:25:50 +0800
Tag:    v2.1.3

Merge branch 'm21_MDL-29159' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit b797666fe8471d8df8d5b633b1d9bf52c37b4035
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Nov 2011 07:43:50 +0800
Tag:    v2.1.3

Merge branch 'MDL-29803' of git://git.luns.net.uk/moodle into MOODLE_21_STABLE

commit d4a8a15d7fe660e7a0aec079cbd9cebd51f26242
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 03 Nov 2011 02:48:42 +0800
Tag:    v2.1.3

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 3d4bcfbddfe67e409733fe3047d3609a629a4b22
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Nov 2011 03:13:26 +0800
Tag:    v2.1.3

Merge branch 'MDL-29879_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit c3a648c34297e67c4ba2e60c28635678203f7736
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Nov 2011 02:54:53 +0800
Tag:    v2.1.3

Merge branch 'm21_MDL-29213' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit 7f5d1ef3c0712d850b94cfd8af271cadf7a8ef5c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 28 Oct 2011 00:49:09 +0800
Tag:    v2.1.3

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit fd26ea42183a554139ac6f3c580d153d6fe0ece1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Oct 2011 23:44:10 +0800
Tag:    v2.1.3

Merge branch 'MDL-29815_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 9ee2ba4676b605e35e13b5dd506c2e77fe74b83b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Oct 2011 07:54:10 +0800
Tag:    v2.1.3

Merge branch 'MDL-29339_b_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 9aa5b604ecd31147d9e47a4f617004768066eb82
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Oct 2011 05:14:49 +0800
Tag:    v2.1.3

Merge branch 'w42_MDL-29867_m21_author' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 26c8e82338722f1a4f67f5acb607fc519629bb7c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 20 Oct 2011 00:41:34 +0800
Tag:    v2.1.3

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 0e6186fb45b5df7b9685ea898a3dea6c73d731c3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Oct 2011 17:00:35 +0800
Tag:    v2.1.3

Merge branch 'wip-MDL-29496-stable21' of git://github.com/phalacee/moodle into MOODLE_21_STABLE

commit 7edd6c250ddd79ed05da00a5f6fa072c9e729e9f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 17 Oct 2011 22:24:10 +0800
Tag:    v2.1.3

Merge branch 'w41_MDL-28454_m21_yuibackport' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 171bbdad02c0d5c6e0db2d106a628146b4c078f5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 17 Oct 2011 03:32:05 +0800
Tag:    v2.1.3

Merge branch 'MDL-28219d-21' of git://github.com/bostelm/moodle into MOODLE_21_STABLE

commit c2dc95003e5e98cb9e3dedfb0dba4d5c9d0680f9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 17 Oct 2011 00:50:04 +0800
Tag:    v2.1.3

Merge branch 'MDL-29191' of git://github.com/hit-moodle/moodle into MOODLE_21_STABLE

commit 52bc12cedcbf1ee87b372dd4f402cea4c80d8766
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sun, 16 Oct 2011 23:37:41 +0800
Tag:    v2.1.3

Merge branch 'MDL-28483-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE