Git merges in Moodle 2.1.3 by Aparup Banerjee

commit babd54537cb5975ea3a5f0409ca3718107599e98
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 24 Nov 2011 16:14:53 +0800
Tag:    v2.1.3

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

commit f0a173ff75e91a8384ae99aa33f06eafca1c0b09
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 24 Nov 2011 14:45:24 +0800
Tag:    v2.1.3

Merge branch 'MDL-29226-M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit 72b19bafdba96677db8b14f6cb60b0317d2e8f4e
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 23 Nov 2011 11:13:57 +0800
Tag:    v2.1.3

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

commit d81e6cc96e5c6df9eaef2c32a5f6493f9845a126
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Nov 2011 17:17:40 +0800
Tag:    v2.1.3

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

commit f0c67f5f0218d1913f299b36fdb9cd2fbd3211de
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Nov 2011 16:17:44 +0800
Tag:    v2.1.3

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

commit 52f04e91a1b6be186d15b9eee50f23720980f2d7
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Nov 2011 16:10:29 +0800
Tag:    v2.1.3

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

commit da86b5661510817cee46531871e3d6aaa10709ff
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Nov 2011 14:25:06 +0800
Tag:    v2.1.3

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

commit 7d584b168bb092a15552fec238060a095572e421
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Nov 2011 01:21:31 +0800
Tag:    v2.1.3

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

commit 2823fe83d9259413a5b97c878e0bc2346c6d8737
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 21 Nov 2011 14:02:52 +0800
Tag:    v2.1.3

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

commit d047cf60aeb5dd7b1217e6c80a7484a238a45e50
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 21 Nov 2011 11:52:39 +0800
Tag:    v2.1.3

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

commit de3476d17162914763fd4d2c762b7c018a17a3cb
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 11 Nov 2011 17:00:56 +0800
Tag:    v2.1.3

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

commit 7159b53324a172620e8f51aae2047054bc244bb6
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Fri, 11 Nov 2011 11:26:44 +0800
Tag:    v2.1.3

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

commit 0eb0583d9d56f35cb6e33c9c5751f3c95632fb7e
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 09 Nov 2011 17:55:17 +0800
Tag:    v2.1.3

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

commit bc1f567d38766571924d0f4bf437a4a25a469d53
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 09 Nov 2011 13:38:53 +0800
Tag:    v2.1.3

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

commit 07340448fe675e5c39aa332e761ecf8441b5f727
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 09 Nov 2011 13:04:02 +0800
Tag:    v2.1.3

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

commit bace4ce456c8af7be199a67bd18f894bf353f147
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 09 Nov 2011 11:04:40 +0800
Tag:    v2.1.3

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

commit 3aed25accdc95013e17ade536a28c33fc75ce4ea
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 08 Nov 2011 20:35:21 +0800
Tag:    v2.1.3

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

commit b57566d3beeaf1c2f74e0584ee5fae7acd780bc5
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 08 Nov 2011 16:48:40 +0800
Tag:    v2.1.3

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

commit 40b90130a031ab2edc35237f652e3f33de948583
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 08 Nov 2011 15:18:42 +0800
Tag:    v2.1.3

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

commit f598387441a16c6a085fcc2b6919ac1b63e28874
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 08 Nov 2011 14:51:20 +0800
Tag:    v2.1.3

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

commit 3e99f27558ec54898e44d678d2f69fd7680dff5c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 08 Nov 2011 11:45:33 +0800
Tag:    v2.1.3

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

commit a49a4aecb2c829960af390d0446c68a9d88fc7db
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 08 Nov 2011 11:38:29 +0800
Tag:    v2.1.3

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

commit d4d070fc35f422dbea35f524820710dcd78ce268
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 08 Nov 2011 11:30:06 +0800
Tag:    v2.1.3

Merge branch 'MDL-30154_21_wip' of git://github.com/grabs/moodle into MOODLE_21_STABLE

commit c8805386845fc6a4101390be15a8847530b28061
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 01 Nov 2011 15:19:51 +0800
Tag:    v2.1.3

Merge branch 'w43_MDL-30005_m21_uri' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 65af1129c5261c904a3980dcaa4569b1e041e993
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 01 Nov 2011 12:16:10 +0800
Tag:    v2.1.3

Merge branch 'w43_MDL-29990_m21_navcontinue' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit df1d01c9f7fee21fdd2463cf02864c501feb5c47
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 01 Nov 2011 12:07:22 +0800
Tag:    v2.1.3

Merge branch 'MDL-29787_M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit 2d930dc6dd597945ccba0371b406946192a8a6f0
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 31 Oct 2011 16:05:51 +0800
Tag:    v2.1.3

Merge branch 'w43_MDL-29966_m21_grouploading' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 4f14428adcb0ad9d977dc398811cd6c88afa78e6
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 31 Oct 2011 15:26:09 +0800
Tag:    v2.1.3

Merge branch 'w43_MDL-29984_m21_enroltoday' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 340aa2008fb407fa187e1e2dd59bb4e606c60698
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 31 Oct 2011 15:17:15 +0800
Tag:    v2.1.3

Merge branch 'w43_MDL-30005_m21_uri' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 3cc9205676b036f51baab40d51a3d56491750e4c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 24 Oct 2011 17:05:39 +0800
Tag:    v2.1.3

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

commit 3d336f22649ce2e9a887d90ceffc2fd95017dd79
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 24 Oct 2011 16:43:21 +0800
Tag:    v2.1.3

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

commit fdb8574046588d3d606babd86e00c82ab8272e0b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 24 Oct 2011 14:49:35 +0800
Tag:    v2.1.3

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

commit 8eb6f9f7a749c163629787071220f18f66ee3272
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 24 Oct 2011 13:52:51 +0800
Tag:    v2.1.3

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

commit b35dc1beb7c699aa0b96ae5286fa285dd84041dd
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 24 Oct 2011 13:06:58 +0800
Tag:    v2.1.3

Merge branch 'MDL-29818-MOODLE_21_STABLE' of git://git.luns.net.uk/moodle into MOODLE_21_STABLE

commit 42f5db3ca819cf8bf8756c28f9f39f5d989a9f09
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 11 Oct 2011 11:24:56 +0800
Tag:    v2.1.3

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

commit 4b7783da19ac5a4649fb3469d9f93227fb4229ac
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 11 Oct 2011 09:45:06 +0800
Tag:    v2.1.3

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

commit 489f5b1338ba4a478991153280781ffdcfaad9ca
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 11 Oct 2011 09:27:29 +0800
Tag:    v2.1.3

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

commit 415c4ee04f21378fd9b12a3546d1e96751650279
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 10 Oct 2011 23:14:42 +0800
Tag:    v2.1.3

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

commit 1d6bb3a8974d7c2d883739dc65bd010cfe268eaa
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 10 Oct 2011 22:46:33 +0800
Tag:    v2.1.3

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