Git merges in Moodle 2.2.2 by Aparup Banerjee

commit 2e0d0590daffde2fe19b6fbea4d1f778d8b5fc57
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Feb 2012 16:41:52 +0800
Tag:    v2.2.2

Merge branch 'MDL-14837_show-time-on-no-duration-events_22_STABLE' of https://github.com/ncsu-delta/moodle into MOODLE_22_STABLE

commit 91470a354e67db6ec63ac244f615b273aa72db4a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Feb 2012 16:23:21 +0800
Tag:    v2.2.2

Merge branch '22_MDL-31419_fix_auth_typo' of git://github.com/gerrywastaken/moodle into MOODLE_22_STABLE

commit 01c7382881a65f7891502c3bddd9b4342ee3264a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Feb 2012 15:37:36 +0800
Tag:    v2.2.2

Merge branch 'MDL-30878-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit 9a7310e80b2a2dde98804e79322cbbd7ae9a8fd3
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Feb 2012 14:42:08 +0800
Tag:    v2.2.2

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

commit 415dd485a579628a6ffc79c29041e43794f39bea
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Feb 2012 14:15:37 +0800
Tag:    v2.2.2

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

commit 844d4f0ce0ad68782540e8f3b2045714a9143ae6
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Feb 2012 13:48:40 +0800
Tag:    v2.2.2

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

commit fe4e706f3a5c17ef111e88ee9866eb8a13e3f32f
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Feb 2012 12:05:20 +0800
Tag:    v2.2.2

Merge branch 'MDL-31399_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit 7fda50ccee4da6523340f30ff8343d660a637009
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 14 Feb 2012 15:39:04 +0800
Tag:    v2.2.2

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

commit bef142834536a6a3be7e5fcd96ad4fc83fbf10f9
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 14 Feb 2012 11:43:03 +0800
Tag:    v2.2.2

Merge branch 'MDL-29471-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit 3509aa02750c21a8bd643fce83150bc909a97e97
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 09 Feb 2012 09:45:08 +0800
Tag:    v2.2.2

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

commit e5f77fdae4c64ba4e8bf6026980fe37261696001
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 08 Feb 2012 11:27:39 +0800
Tag:    v2.2.2

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

commit 4bd74c8ddce16d8c87af3410f4f51ffc071431ab
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 08 Feb 2012 10:12:26 +0800
Tag:    v2.2.2

Merge branch 'm22_MDL-31461' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit 822790437e29fb4ac15ac8cf4b6c622c4a0a8a91
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 08 Feb 2012 09:59:04 +0800
Tag:    v2.2.2

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

commit 3e299e464d123143993fcc5d6376c159e75540ab
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 07 Feb 2012 15:12:26 +0800
Tag:    v2.2.2

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

commit 6432e1b4e199d503931f707643c2339d66547a02
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 02 Feb 2012 11:13:22 +0800
Tag:    v2.2.2

Merge branch 'm22_MDL-31360' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit cfbde86579b805c72a071656ae9baa3ca2e932ef
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 31 Jan 2012 16:51:08 +0800
Tag:    v2.2.2

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

commit 5684c6ab9943b26c8673602dc7f3f42854a3878a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 31 Jan 2012 16:43:46 +0800
Tag:    v2.2.2

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

commit a5f1f8c0e205180d54dafa22fed98c7f8d533ab3
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 31 Jan 2012 14:36:15 +0800
Tag:    v2.2.2

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

commit 3d257cbf0890aafc0c91dc33df82d9b4ae99677f
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 31 Jan 2012 11:52:24 +0800
Tag:    v2.2.2

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

commit 611d3bd71d6f15679c948602cd1a79d2e01352d6
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 31 Jan 2012 11:15:55 +0800
Tag:    v2.2.2

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

commit db780684436bb2a51bc3826c431e4a3b94c1d3af
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 30 Jan 2012 16:26:47 +0800
Tag:    v2.2.2

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

commit c8a11c7410c03c277683c014e9db880a5bb0517c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 30 Jan 2012 14:25:35 +0800
Tag:    v2.2.2

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

commit c327996e6b45fa5ba03ced7bcf8f2dbc854ff695
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 24 Jan 2012 23:01:26 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-31224-m22' of git://github.com/samhemelryk/moodle into MOODLE_22_STABLE

commit b7c8fb66104b1b3525fbc578e923c2f5c3657dfa
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 24 Jan 2012 07:12:31 +0800
Tag:    v2.2.2

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

commit 787c2eefd3e13f75d2282c055fcf528d49e6eec4
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 24 Jan 2012 06:58:33 +0800
Tag:    v2.2.2

Merge branch 'w04_MDL-31184_m22_glosreset' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 1a3b5c6cfc58d74436366ea76f995cbc4c9bf6f2
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 16 Jan 2012 15:29:30 +0800
Tag:    v2.2.2

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

commit 0a52c0d63d2f8fba0aa6810fdf201699c5356151
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 16 Jan 2012 14:52:48 +0800
Tag:    v2.2.2

Merge branch 'w03_MDL-31166_m22_clipath' of https://github.com/skodak/moodle into MOODLE_22_STABLE

commit 7b3dae90968fc1d24635109ab9acc561cfea34ee
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 16 Jan 2012 14:48:16 +0800
Tag:    v2.2.2

Merge branch 'w03_MDL-21992_m22_customscripts' of https://github.com/skodak/moodle into MOODLE_22_STABLE

commit 94828bec3588291eee96d6b9c69e1da807161382
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 16 Jan 2012 11:39:43 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-31072-MOODLE_22_STABLE' of github.com:marinaglancy/moodle into MOODLE_22_STABLE

commit 54afb1ca01f9c6c9b0ca42cefccef69e439ca4bf
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 09 Jan 2012 12:20:34 +0800
Tag:    v2.2.2

Merge branch 'w02_MDL-30718_m22_usertimedb' of git://github.com/skodak/moodle into MOODLE_22_STABLE