Git merges in Moodle 2.1.4 by Eloy Lafuente (stronk7)

commit 78fcd06775d95bcc9a8cd9113e3bea08ca941b82
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 05 Jan 2012 19:50:39 +0800
Tag:    v2.1.4

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

commit 0890c256ee135d4a019b1e521cccdeaa4bb1867e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Jan 2012 09:14:53 +0800
Tag:    v2.1.4

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

commit f1ec3e694c254b3bfbd3bdb6fed726bd61231e37
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 23 Dec 2011 09:53:23 +0800
Tag:    v2.1.4

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

commit 7f50276ea01c03150a5b3a858358063399b81687
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 21 Dec 2011 06:34:23 +0800
Tag:    v2.1.4

Merge branch 'MDL-30170-mnet-undelete_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit df752e6a1d6bb2568cd20de2148f2cc9fcf9af74
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 21 Dec 2011 02:50:03 +0800
Tag:    v2.1.4

Merge branch 'MDL-30603_m21' of https://github.com/nebgor/moodle into MOODLE_21_STABLE

commit 65cb4fe5484258cad15664a7a9b3539228835f0a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 21 Dec 2011 01:56:24 +0800
Tag:    v2.1.4

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

commit 107ebdb86d1fc710e79bcdf4e64b5e6ee5406578
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 20 Dec 2011 10:13:11 +0800
Tag:    v2.1.4

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

commit 0a6d17e288d5c0b729c677f7585df95ce373890f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 20 Dec 2011 09:22:20 +0800
Tag:    v2.1.4

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

commit bf5bb85d421dcc74fbb931f6823cfbb7ed4bff8c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 20 Dec 2011 09:01:49 +0800
Tag:    v2.1.4

Merge branch 'MDL-30738_21_STABLE' of git://github.com/kiklop74/moodle into MOODLE_21_STABLE

commit 6e1f50f2c84db94a6e63d4807ea9ef3fefa2f665
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 20 Dec 2011 07:05:36 +0800
Tag:    v2.1.4

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

commit 12a1176976bab005ea3c89d78c5c17dff0aac489
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 19 Dec 2011 09:58:44 +0800
Tag:    v2.1.4

Merge branch 'wip-MDL-30791-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE

commit c4190e3140c5917cbc6001eea4ed3038ae6556ee
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 15 Dec 2011 05:45:32 +0800
Tag:    v2.1.4

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

commit 222b780775fd99dce637ae73e0691d05696697e0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 14 Dec 2011 10:16:48 +0800
Tag:    v2.1.4

Merge branch 'wip-MDL-27767-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE

commit 5e48a7c5efb1ec9f5109d7506cc951477122c80b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 09 Dec 2011 23:09:39 +0800
Tag:    v2.1.4

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

commit 55dae3ac866e08577ed28f8efa7dfbe59ed53fed
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 09 Dec 2011 06:37:37 +0800
Tag:    v2.1.4

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

commit 938965931d8f99b3ba5faadde32dc9149bd53deb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 09 Dec 2011 02:23:35 +0800
Tag:    v2.1.4

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

commit 5d497d7f4b6cb91c746f66b88e4b3d1e5d4d753f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 08 Dec 2011 08:37:20 +0800
Tag:    v2.1.4

Merge branch 'wip-MDL-30582-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE

commit 62bd66a5bc8fa4dbf11c0e4592a07cbda7ed0b94
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 08 Dec 2011 08:02:24 +0800
Tag:    v2.1.4

Merge branch 'MDL-26522_user_report_menu_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit c9bb3cd57586e366472b246f20549b839938805c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 08 Dec 2011 07:45:36 +0800
Tag:    v2.1.4

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

commit 259739c8a37c1a5ffffef77e2580d85d7990083e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 08 Dec 2011 07:40:15 +0800
Tag:    v2.1.4

Merge branch 'wip-MDL-30222-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE

commit 824e110b8c427c4f5e9c4544535a22656500551b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 01 Dec 2011 19:04:21 +0800
Tag:    v2.1.4

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

commit 5f7fc6ca311fa07a7b3c58322852d1abd850902b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 01 Dec 2011 17:45:16 +0800
Tag:    v2.1.4

Merge branch 'MDL-30544_disable_notifications_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit 360dd25e1eb429c026b3fee0a0be29e99c33c168
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 30 Nov 2011 02:47:57 +0800
Tag:    v2.1.4

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

commit 6d959a5564ae0457b032708d9424327c6a9cc6f9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Nov 2011 10:18:13 +0800
Tag:    v2.1.4

Merge branch 'wip-MDL-30378-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE