Git merges in Moodle 2.1.1 by Eloy Lafuente (stronk7)

commit 150c0b7e2c6ef8cd401a3a3837032e1da0623b84
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 Jan 2013 19:17:20 +0800
Tag:    v2.1.10

Merge branch 'install_21_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_21_STABLE

commit db6243d0a16ee97618cd611301d32576ddab5286
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 21 Dec 2012 03:57:56 +0800
Tag:    v2.1.10

Merge branch 'install_21_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_21_STABLE

commit fe97a3dc7acb328d0dc7cafa62b39159b966117a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Jul 2011 01:05:04 +0800
Tag:    v2.1.1

Merge branch 'MDL-28221-resource-conversion_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit 6f09ed8643704189e670e6ee29a087971b2d4da8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jul 2011 22:30:33 +0800
Tag:    v2.1.1

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

commit 1187c38d6d5b24aba8defd83b2d677bc10e91164
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jul 2011 01:48:10 +0800
Tag:    v2.1.1

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

commit a19c77bd242b722b679814252bb620baca2597a4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jul 2011 01:43:53 +0800
Tag:    v2.1.1

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

commit b8cde34b06fae7702b3929c58153965dfd2cac19
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jul 2011 01:36:01 +0800
Tag:    v2.1.1

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

commit 24813d35f76506c107a90fa97f351e88c12cc127
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 08 Jul 2011 07:18:44 +0800
Tag:    v2.1.1

Merge branch 'MDL-28015-workshop-sql_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit 8437ce030de94ae3cb820c7b63e68948aa183aae
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 08 Jul 2011 06:58:08 +0800
Tag:    v2.1.1

Merge branch 'MDL-28168-custommenu_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit 14cf05a2cf06986d9c70edaf61f9a802aa5555b1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Jul 2011 09:01:30 +0800
Tag:    v2.1.1

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

commit e986a24a9d90a5ef7f63c0ac4c5a6952fa25c9a7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Jul 2011 08:22:22 +0800
Tag:    v2.1.1

Merge branch 'MDL-27989_MOODLE_21_STABLE' of git://github.com/kordan/moodle into MOODLE_21_STABLE

commit d396a03bacfbee8be092b03e9e5dcafcf0c72f59
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Jul 2011 23:59:57 +0800
Tag:    v2.1.1

Merge branch 'MDL-28185_m21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE