Git merges in Moodle 2.1.5 by Aparup Banerjee

commit 91c54c7c1102de1eb4b25099b41bfa4ba7a14d6e
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Feb 2012 16:42:02 +0800
Tag:    v2.1.5

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

commit fdbdba153bc98f41546ca5520413826057dd99c9
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Feb 2012 15:38:56 +0800
Tag:    v2.1.5

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

commit e46da9a7fe4fc0f6ab452d1d8768e58addbfaa56
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Feb 2012 14:42:24 +0800
Tag:    v2.1.5

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

commit 8b1876f3b554255c66cf8b394814ca5b6ad3812d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Feb 2012 14:15:43 +0800
Tag:    v2.1.5

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

commit 4c52d60ed4106837ac42c719ce300998c178a159
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Feb 2012 13:48:45 +0800
Tag:    v2.1.5

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

commit 40e24058b2d5458c75eb65ae9bb0b4be683131b6
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 28 Feb 2012 12:05:25 +0800
Tag:    v2.1.5

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

commit b6aa60c8104d73b086de24b694ba7c3e787b2fc4
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 14 Feb 2012 15:39:10 +0800
Tag:    v2.1.5

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

commit 38a88bb4bc73ae744bb651a15cd8f20f9cc0924b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 14 Feb 2012 11:43:15 +0800
Tag:    v2.1.5

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

commit fa639fef7aad47dde3f422f21311d535283b4f38
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 09 Feb 2012 10:17:01 +0800
Tag:    v2.1.5

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

commit 60811b8dc9784565521160166dc7c83fe25cc345
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 08 Feb 2012 11:27:50 +0800
Tag:    v2.1.5

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

commit 7acc25342a3b905e10e727cb84509cd8de4fbc08
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 08 Feb 2012 09:59:36 +0800
Tag:    v2.1.5

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

commit dbc410767ad7d8a0c999bd249dbcd476b4f03ef5
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 07 Feb 2012 16:37:11 +0800
Tag:    v2.1.5

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

commit e77a77bbf5e70f5d9f1c1f1fb39a9088ab9441b5
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 07 Feb 2012 15:12:50 +0800
Tag:    v2.1.5

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

commit 49b52b3fb4bf62a42bf08f9daa3bcd62f83e6cac
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 31 Jan 2012 16:51:47 +0800
Tag:    v2.1.5

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

commit 5d8d3a1a08f549d98370e4a762818acc9e3e6892
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 31 Jan 2012 16:44:07 +0800
Tag:    v2.1.5

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

commit 21defa3d5e0429350407bdb7292c54f7be07a3d7
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 31 Jan 2012 14:36:54 +0800
Tag:    v2.1.5

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

commit 05b6988a0a2a37d5713b97275cf7c2a427d73c35
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 31 Jan 2012 11:52:34 +0800
Tag:    v2.1.5

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

commit 2cd7d23056dcbd352348b61d63e44d78c3203553
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 31 Jan 2012 11:16:09 +0800
Tag:    v2.1.5

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

commit 8cbc3946a399be36bdb5eefe6915bdbf230a8bf9
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 30 Jan 2012 16:27:26 +0800
Tag:    v2.1.5

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

commit b69e249a6dbf36436d713d2036a0415aece5d7ba
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 30 Jan 2012 12:50:51 +0800
Tag:    v2.1.5

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

commit 87c259ce02abcc03b4d8e3d33ba1abd967f5ba96
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 24 Jan 2012 23:02:12 +0800
Tag:    v2.1.5

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

commit 5528fbe8803cf31e0672fefbd753ce1a69c3d697
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 24 Jan 2012 07:17:18 +0800
Tag:    v2.1.5

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

commit bfa2605567cf52b7ddaade423342c3b980ae5d8c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 24 Jan 2012 06:59:17 +0800
Tag:    v2.1.5

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

commit df2842cc6beb4c2123b2cb1e26a404aaf02b8969
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 16 Jan 2012 15:31:36 +0800
Tag:    v2.1.5

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

commit 7741d150c9d0e45eaac840fb9035ec5279d00665
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 16 Jan 2012 14:58:49 +0800
Tag:    v2.1.5

Merge branch 'w03_MDL-30003_m21_userstats' of https://github.com/skodak/moodle into MOODLE_21_STABLE

commit 4d47200557b8a0b4c12131171fec39efdad0b185
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 09 Jan 2012 12:21:40 +0800
Tag:    v2.1.5

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