Git merges in Moodle 2.2.4 by Aparup Banerjee

commit f4eaf5c7f067915936bb7458aa24df266f7115b1
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 20 Jun 2012 17:18:30 +0800
Tag:    v2.2.4

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


commit 89c3d84eda723c78fa7c3636816e7fe5f4f4d70c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 12 Jun 2012 11:27:48 +0800
Tag:    v2.2.4

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


commit c93ff53c8272ffe2121609c7f5f1a2902aee6f8a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 11 Jun 2012 13:55:54 +0800
Tag:    v2.2.4

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


commit 092e389f4fe5c8b709004a490f5fc1eb8073908c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 05 Jun 2012 15:15:44 +0800
Tag:    v2.2.4

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


commit c7fc98256a114f2c44dc6f74456009831670478a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 31 May 2012 14:15:44 +0800
Tag:    v2.2.4

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


commit 4fb3cc589471044297fae3b7c7d23a1923694943
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 24 May 2012 15:42:22 +0800
Tag:    v2.2.4

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


commit 5a6042c9be015fa5e722ee42150165b0c2974ccc
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 16 May 2012 16:05:42 +0800
Tag:    v2.2.4

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


commit 479f14a07be473e1179ae7c6255b9d0117426f26
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 15 May 2012 16:10:33 +0800
Tag:    v2.2.4

Merge branch 'MDL-32861-22' of https://github.com/mackensen/moodle into MOODLE_22_STABLE


commit 1eab78b30e1e932a866fa340be6ce4570b97e27f
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 15 May 2012 11:08:21 +0800
Tag:    v2.2.4

Merge branch 'MDL-25695-22' of https://github.com/mackensen/moodle into MOODLE_22_STABLE