Git merges in Moodle 2.1.4 by Aparup Banerjee

commit 869e613aea06d0ad4810b97d110509710811a087
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 03 Jan 2012 12:32:20 +0800
Tag:    v2.1.4

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

commit 0d3504b4bb7a172913711f1ee5f18c444a2f5e04
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 21 Dec 2011 14:17:39 +0800
Tag:    v2.1.4

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

commit ee7f8610dbab1aa51b53f282f8fa9e2956310552
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 21 Dec 2011 13:24:43 +0800
Tag:    v2.1.4

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

commit 364622b4662d9f349f3701ed548cda2f31491fea
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 21 Dec 2011 11:32:41 +0800
Tag:    v2.1.4

MDL-28126 webservice : resolved integration conflicts

commit 88d3c04840d4e200819575cca13b8c7ba4c610bb
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 20 Dec 2011 19:16:12 +0800
Tag:    v2.1.4

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

commit 4b61488d0fa14d11df09c17868bf7583f1d96315
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 20 Dec 2011 11:11:46 +0800
Tag:    v2.1.4

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

commit 9822be6f4c173eb5f4a13a8c4ffba40e192acd6a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Dec 2011 17:07:56 +0800
Tag:    v2.1.4

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

commit 8f10c31083d218ffde2eff966a99a0df7e3d62f7
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Dec 2011 14:38:01 +0800
Tag:    v2.1.4

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

commit 552390c5c5d2c7eb606a11dc5b7fe1ad42687f2b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 09 Dec 2011 15:27:21 +0800
Tag:    v2.1.4

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

commit 808a7622b9aa3b78f280f2a088f1b7d5be451a51
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 09 Dec 2011 10:48:04 +0800
Tag:    v2.1.4

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

commit 4d642dc1b2b0e6db43b171853d79a7c416c35363
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 08 Dec 2011 16:20:32 +0800
Tag:    v2.1.4

Merge branch 'wip-MDL-30336-MOODLE_21_STABLE' of git://github.com/abgreeve/moodle into MOODLE_21_STABLE

commit 2874fc880f1c8153b3e0cca6813aa1c2172ade54
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 08 Dec 2011 15:55:25 +0800
Tag:    v2.1.4

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

commit 47ec4ba7d849d08e4cfdbb5f1464a9c5b423ace1
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 08 Dec 2011 14:05:45 +0800
Tag:    v2.1.4

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

commit 65bf17ee241ffa4c5f2e6d347cca1e6f4c17e5bc
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 08 Dec 2011 13:48:45 +0800
Tag:    v2.1.4

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

commit 759a28d97b9a10fb55b09c3b433467e8e763793d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 08 Dec 2011 13:40:10 +0800
Tag:    v2.1.4

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

commit cd0b9e040f49b77969d04800abf34a0c719290bb
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 01 Dec 2011 11:26:52 +0800
Tag:    v2.1.4

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

commit b5c3eee58e5af7af0a3c2d2d38602ecf36a78bb9
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 30 Nov 2011 15:18:28 +0800
Tag:    v2.1.4

Merge branch 'wip-MDL-27334-MOODLE_21_STABLE' of git://github.com/abgreeve/moodle into MOODLE_21_STABLE

commit fc51860a032b0ebf105dad09a21036ecc34d8adc
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 30 Nov 2011 14:42:59 +0800
Tag:    v2.1.4

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

commit ecbbcd5e07405582d082b76d344d62788b2ffe71
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 30 Nov 2011 14:11:50 +0800
Tag:    v2.1.4

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

commit 28f8069eb5ea76f11576e31c806cb4fd46e10e7f
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 28 Nov 2011 11:48:30 +0800
Tag:    v2.1.4

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