Git merges in Moodle 2.1.6 by Aparup Banerjee

commit dbcfd4f152939ea464e45bc97aef16ee3a794b22
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 02 May 2012 13:55:58 +0800
Tag:    v2.1.6

Merge branch 'MDL-28657-21' of https://github.com/mackensen/moodle into MOODLE_21_STABLE

commit a0e75f0360cf51bc56d1ef81cec5428a3bc79934
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 05 Apr 2012 16:20:03 +0800
Tag:    v2.1.6

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

commit 69d01769231312016601042cf2195a5bd1ed5d34
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 04 Apr 2012 13:41:04 +0800
Tag:    v2.1.6

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

commit e496f11da2eff1c652a6eefe2673d42562327cdf
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 03 Apr 2012 17:34:54 +0800
Tag:    v2.1.6

Merge branch 'w14_MDL-32141_m21_tinymce' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit a0bf1073c5d683a54cc446af62ecc09c83b3c471
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 03 Apr 2012 17:01:02 +0800
Tag:    v2.1.6

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

commit 3d060749536339d25925675a13bca2bfb4ac22a8
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 27 Mar 2012 10:10:31 +0800
Tag:    v2.1.6

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

commit c8f95660ff265480172d7f9b72bc8d4734eb0e51
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 20 Mar 2012 16:12:31 +0800
Tag:    v2.1.6

Merge branch 'MDL-29848-21' of https://github.com/mackensen/moodle into MOODLE_21_STABLE

commit 49e45d069b32af8323322671b887223102ada227
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 20 Mar 2012 10:10:44 +0800
Tag:    v2.1.6

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

commit a5d7e18abe554e17cd9eb7703cddd70f2649bcb8
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Mar 2012 15:30:48 +0800
Tag:    v2.1.6

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

commit 361492a8069041f81113a5835ce6d2fc98566c1a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Mar 2012 11:52:42 +0800
Tag:    v2.1.6

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

commit e785ca696ee8c5ad9e22a4e5175bfa424b508862
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Mar 2012 11:32:44 +0800
Tag:    v2.1.6

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