Git merges in Moodle 2.2.1 by Aparup Banerjee

commit 8ef685cf4ce53321dd3454a2393285c54b5deb85
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 03 Jan 2012 12:31:22 +0800
Tag:    v2.2.1

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

commit 8fe13ecf1a2d6721cc2cd38cb7e522ec820bacb5
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 21 Dec 2011 14:16:55 +0800
Tag:    v2.2.1

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

commit dbfa519ad9e4d33ac3a4cd506d606d56a2f0bbff
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 21 Dec 2011 11:28:33 +0800
Tag:    v2.2.1

MDL-28126 webservice : resolved integration conflicts

commit 40b67fca0a31ff92c0a4ec541cb7a3e5a8d62455
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 20 Dec 2011 19:15:20 +0800
Tag:    v2.2.1

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

commit 18952a18fd6fdbcd9459c27d10eb18852615f223
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 20 Dec 2011 11:11:02 +0800
Tag:    v2.2.1

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

commit 85daa5926c88b057fdb53f0e09e83dace5f4e689
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 19 Dec 2011 11:53:32 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-30735_m22_cron' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit a23463acec975b05c3f1acc9ea3cd3fbbcb007dc
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Dec 2011 17:05:07 +0800
Tag:    v2.2.1

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

commit 9dfd9a124dbcad557190d631fcf6a64cfd9fbd76
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Dec 2011 14:36:02 +0800
Tag:    v2.2.1

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

commit a3bb5afdd06ffb3f03e240dd68273dc75b7856ff
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Dec 2011 14:01:57 +0800
Tag:    v2.2.1

Merge branch 'MDL-30562_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 3a353b12baa0a02e743b92fd79f41108e5b3515a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 13 Dec 2011 13:21:05 +0800
Tag:    v2.2.1

Merge branch 'MDL-30655-m22' of git://github.com/sammarshallou/moodle into MOODLE_22_STABLE

commit b750cfde8145c23b63d062f5fcdcc0dde1ff89af
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 12 Dec 2011 15:05:37 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-30613_m22_FULLME' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 0f69a9eaaf196177c4b1c9fa8028b27a91049983
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 08 Dec 2011 16:19:02 +0800
Tag:    v2.2.1

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

commit cdbd44f00eb4648f1320807d4df725da3e8e58df
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 08 Dec 2011 15:54:55 +0800
Tag:    v2.2.1

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

commit 30e1b798893f9408ecf304ddbe23ea2fd5eff1fd
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 08 Dec 2011 14:04:46 +0800
Tag:    v2.2.1

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

commit d30043c8523e2f097b664e32d911077b3b44fa66
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 08 Dec 2011 13:48:27 +0800
Tag:    v2.2.1

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

commit add75e9682f2a74f1abb4c6832c2954c73b8fb9b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 08 Dec 2011 13:39:49 +0800
Tag:    v2.2.1

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