Git merges in Moodle 2.1.6 by Eloy Lafuente (stronk7)

commit 3478ce9bdc38046b6f4c9e6b34be716c454a0588
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 May 2012 18:10:56 +0800
Tag:    v2.1.6

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

commit 7b84d2886a6699101e29e745cda7b17b59748eec
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 10 May 2012 01:32:26 +0800
Tag:    v2.1.6

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

commit c0502c170ce1f4a10ac762be96f0a9ee3d604c1a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 04 May 2012 19:07:14 +0800
Tag:    v2.1.6

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

commit 668f04282a991b6552e405a6893edd87fdbc2e16
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 03 May 2012 06:46:39 +0800
Tag:    v2.1.6

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

commit 7649be6ea07c1c953013e44ee2953a572b941db4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 27 Apr 2012 18:41:35 +0800
Tag:    v2.1.6

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

commit 862f48225dedce4b3abde1abde5d4d3d806da338
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 26 Apr 2012 08:59:35 +0800
Tag:    v2.1.6

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

commit 538d482927f619d561dd0f43a52e91d7763ef01d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 26 Apr 2012 08:21:22 +0800
Tag:    v2.1.6

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

commit 7a48124d69d5e18f75c19a7040bc2a41439e5c2c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Apr 2012 19:08:19 +0800
Tag:    v2.1.6

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

commit 9a2bb1ee2c6c3004330f49b9d61cad78b625d7ec
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Apr 2012 09:35:21 +0800
Tag:    v2.1.6

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

commit b2313c434fd90f09eda6cb86f5480655cc8a33a1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Apr 2012 07:57:28 +0800
Tag:    v2.1.6

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

commit 4790c88e85e01ce608a2d86644d96c86a43e6cae
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Apr 2012 07:13:22 +0800
Tag:    v2.1.6

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

commit a52b49b925ecb0a51b2739e157020f13f6381907
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Apr 2012 05:30:38 +0800
Tag:    v2.1.6

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

commit 04cc6a1ba1ac7cb42df3e4afc1edd820cd1d6fdb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Apr 2012 19:10:08 +0800
Tag:    v2.1.6

Merge branch 'MDL-32249-21' of github.com:srynot4sale/moodle into MOODLE_21_STABLE

commit 02c71f990f542ffc5c0de26df8578f49b8ee4eda
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Apr 2012 06:31:18 +0800
Tag:    v2.1.6

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

commit db472efd13d4b186dc338effba69fafd8734ea0e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Apr 2012 06:09:05 +0800
Tag:    v2.1.6

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

commit c168d35af5af8c43c0db647eed8dd2142a870769
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Apr 2012 06:04:51 +0800
Tag:    v2.1.6

Merge branch 'wip-MDL-26500-21' of git://github.com/danpoltawski/moodle into MOODLE_21_STABLE

commit 721c418985b58b30a6b539a2e50f3c248267a1c2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Apr 2012 04:39:36 +0800
Tag:    v2.1.6

Merge branch 'w16_MDL-30242_m21_session' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 80a9e2aab9b7a39d7885f47c1401cb632fad6181
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Apr 2012 06:12:02 +0800
Tag:    v2.1.6

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

commit 471b1c8b30bb6f1d2017b04ddbcb171c87a3666e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Apr 2012 05:53:09 +0800
Tag:    v2.1.6

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

commit ee72fe8881011835fdcfad87ddb8217f43500297
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Apr 2012 03:06:28 +0800
Tag:    v2.1.6

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

commit 539eb194b1dbfc798b8da59a5a55371fa98f2433
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 29 Mar 2012 19:20:25 +0800
Tag:    v2.1.6

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

commit 197cd287711321236db4ddb7be1d645a8ca33029
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 15 Mar 2012 18:42:18 +0800
Tag:    v2.1.6

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

commit b434431b38e3dbd1243d5a17db9ed29badc41067
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 14 Mar 2012 01:09:36 +0800
Tag:    v2.1.6

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

commit 651cf35cbecd0941d9a71370712aac0b1ed62efb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 13 Mar 2012 23:17:14 +0800
Tag:    v2.1.6

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

commit 8135ecf6e1312d035ab7e57fb3facfcc730defd1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 13 Mar 2012 04:37:18 +0800
Tag:    v2.1.6

Merge branch 'w11_MDL-31956_m21_paypal' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 41c65d7d8e95ad2e07654bcb7e1585bbbd682f3d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 13 Mar 2012 01:01:21 +0800
Tag:    v2.1.6

Merge branch 'w11_MDL-31595_m21_enrolme' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 833af94c19a092b7ece410872cad267907edfd73
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 12 Mar 2012 23:34:28 +0800
Tag:    v2.1.6

Merge branch 'w11_MDL-31815_m21_confirmemail' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 3bc7584619b6183170a7581100e4b3010e15fd1d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 12 Mar 2012 22:49:41 +0800
Tag:    v2.1.6

Merge branch 'w11_MDL-31534_m21_pageinitroot' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 2d2dfae5e9e43f71723e7a0fa3a9ccd488d62352
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 12 Mar 2012 20:38:51 +0800
Tag:    v2.1.6

Merge branch 'w11_MDL-31494_m21_adodblink' of git://github.com/skodak/moodle into MOODLE_21_STABLE