Git merges in Moodle 2.2.4 by Dan Poltawski

commit 8e12fdea29ac00ccdae4e862b472d587ddf9fb4c
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 04 Jul 2012 09:51:36 +0800
Tag:    v2.2.4

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

commit c47951f80624301e66c69ba786160818dce1500b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Jul 2012 11:51:36 +0800
Tag:    v2.2.4

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

commit eb8509c5c3246b85811cd85985a2312599a30981
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Jul 2012 11:47:36 +0800
Tag:    v2.2.4

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

commit 9db56e51d9d914212717804093a7fac20bf1dd64
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Jul 2012 11:40:22 +0800
Tag:    v2.2.4

Merge branch 'w27_MDL-34036_m22_bulkrole' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit b33cc65f3e6602e47dbdd582652d94aa31a5761a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Jul 2012 11:01:52 +0800
Tag:    v2.2.4

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

commit 705b30e99efb9fad4b0d0ca6026f4ecdd7e38436
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Jul 2012 10:39:26 +0800
Tag:    v2.2.4

Merge branch 'w27_MDL-34123_m22_newpasslang' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 041a4a7d94be504184b126bfaa697bc40c78978e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Jul 2012 17:37:16 +0800
Tag:    v2.2.4

Merge branch 'MDL-33916-MOODLE_22_STABLE-1' of git://git.luns.net.uk/moodle into MOODLE_22_STABLE

commit 66f9505a530a3021ab2cbfa3318203a2f1b0f201
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Jul 2012 17:25:07 +0800
Tag:    v2.2.4

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

commit 8579d40d593f09b61f475e34bf4d84088380ec06
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Jul 2012 16:34:28 +0800
Tag:    v2.2.4

Merge branch 'w27_MDL-34045_m22_idnumber' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit c185e558a6cb24aced2ddb26ed38d7bee97399be
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Jul 2012 16:28:20 +0800
Tag:    v2.2.4

Merge branch 'MDL-34025_m22' of https://github.com/markn86/moodle into MOODLE_22_STABLE

commit ca6495bb72d3d2d49f5896cb0d0a1e77ca6f80f6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Jul 2012 16:19:28 +0800
Tag:    v2.2.4

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

commit cd7265af3a3860542ecf332a744156883c45bba5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Jul 2012 16:14:52 +0800
Tag:    v2.2.4

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

commit 4769b04283bf2fd96a247dea0666cceefcf1ba06
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Jul 2012 16:07:42 +0800
Tag:    v2.2.4

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

commit 1693774015eb75aab631441440ce53ae12d09c61
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Jul 2012 15:50:32 +0800
Tag:    v2.2.4

Merge branch 'm22_MDL-33053_AICC_flattened_TOC' of git://github.com/scara/moodle into MOODLE_22_STABLE

commit de856ec6a8e1fe25919c67f1d7c92c5e632e25b7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Jul 2012 15:46:07 +0800
Tag:    v2.2.4

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

commit c25e1814ce49a32ba9fa7c3fd4a59f3cc89b7d8b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Jul 2012 15:43:21 +0800
Tag:    v2.2.4

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

commit 42ed5416a518453e930f7bba8aac02e14581a6da
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Jul 2012 15:34:27 +0800
Tag:    v2.2.4

Merge branch 'MDL-9073-22' of github.com:FMCorz/moodle into MOODLE_22_STABLE

commit bf9417002dc29a320c6cecebe5a7c47f2e0b6a41
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Jul 2012 15:24:29 +0800
Tag:    v2.2.4

Merge branch 'm22_MDL-31203_advanced_forum_search_always_reverts_date_from_and_to' of git://github.com/kanikagoyal/moodle into MOODLE_22_STABLE

commit 52f95b543175731808ecfd238a9ce258ffdbab45
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Jul 2012 15:12:57 +0800
Tag:    v2.2.4

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

commit de9de3cc1baa460c04a054a18f027554d77c8757
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Jul 2012 11:27:33 +0800
Tag:    v2.2.4

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

commit 68b0cae5bc0490d3de67ed289f293f3928bc2a4c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Jun 2012 21:57:08 +0800
Tag:    v2.2.4

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

commit e9a8da9d76e2b6f94c0c9966010a474870be3068
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Jun 2012 18:47:10 +0800
Tag:    v2.2.4

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

commit 5e1fc324de394636a9c8d37fa944b0b872f1ab82
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Jun 2012 21:40:59 +0800
Tag:    v2.2.4

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

commit d9a92e8f41da609b3f766316cd0c667cd26f5eec
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Jun 2012 15:07:42 +0800
Tag:    v2.2.4

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

commit 2b4dff5697209d334fc3b97d4caa69af55ee8fe6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Jun 2012 14:34:39 +0800
Tag:    v2.2.4

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

commit 034f40257e27d691cfffff2ad510936dd8ebdde7
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 15 Jun 2012 18:38:56 +0800
Tag:    v2.2.4

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

commit b6c90037568496f334b87940283d41193045c755
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 15 Jun 2012 11:03:19 +0800
Tag:    v2.2.4

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

commit be87ace1b6e79d0051e106f1a169257504404c4a
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 14 Jun 2012 12:29:21 +0800
Tag:    v2.2.4

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

commit c2a3bd52d2345c126926c29fe14be2a3f17304d3
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 13 Jun 2012 17:45:36 +0800
Tag:    v2.2.4

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

commit 1e93a653a474398020cf33a21214b640c0df22ef
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 07 Jun 2012 22:23:48 +0800
Tag:    v2.2.4

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

commit 99778c82c7f5ec3076df1df3eeba297aecdb2375
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 06 Jun 2012 10:32:07 +0800
Tag:    v2.2.4

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

commit c4b48436f944f3239f1a8a8560248b63e02d86c5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Jun 2012 12:34:58 +0800
Tag:    v2.2.4

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

commit 5fd1ca61b8b754e94f555cf60fce3d57a11161e8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Jun 2012 11:58:40 +0800
Tag:    v2.2.4

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

commit e2cc9b272e250f4d44862d21f1878bfcf5d2aef1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Jun 2012 09:35:31 +0800
Tag:    v2.2.4

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

commit 085adaf545ea482be51ca35ba9f64ab75015ce85
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Jun 2012 16:22:07 +0800
Tag:    v2.2.4

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

commit 5411ca9e4077f5e8dc310a76415fc9bcac7b9f0c
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 31 May 2012 16:59:37 +0800
Tag:    v2.2.4

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

commit 4625a1b540e487b0cc24d610a0768af3b1068c23
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 31 May 2012 10:36:05 +0800
Tag:    v2.2.4

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

commit 787132eabcc3aaebfd8de7a086e927f7dcff709d
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 30 May 2012 11:36:01 +0800
Tag:    v2.2.4

Merge branch 'MDL-33398b-22' of git://github.com/srynot4sale/moodle into MOODLE_22_STABLE

commit c5fc1191e03613f3e54bd1d6edce849318da1648
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 May 2012 16:20:36 +0800
Tag:    v2.2.4

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

commit ef6ad523522e83d4ae7ca4fc678b5775a0d773a9
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 May 2012 16:11:08 +0800
Tag:    v2.2.4

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

commit 1605e8d8d2bba2883aa0c82bf9b870cd18800f3b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 May 2012 15:12:43 +0800
Tag:    v2.2.4

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

commit 865f537feafa82f880e8d4e18d9f31c92524af94
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 May 2012 15:10:55 +0800
Tag:    v2.2.4

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

commit 7e3707635c68bf1538050928b98d8b8d72be7bb0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 May 2012 16:03:11 +0800
Tag:    v2.2.4

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

commit d855d780a3377a5fd4c6c5056c1a79070dd01909
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 May 2012 15:24:08 +0800
Tag:    v2.2.4

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

commit 0e55d4af3640259bfe9b4264f58072d1b25e7a31
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 May 2012 15:18:57 +0800
Tag:    v2.2.4

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

commit f4cfa2cbd69757a52fbbc635194b5c3f962b45a2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 May 2012 14:32:53 +0800
Tag:    v2.2.4

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

commit a66bb4213e0852b6cc77dd77e867ab0985aa367e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 May 2012 12:16:26 +0800
Tag:    v2.2.4

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

commit adb9f1aa1af3316c15f90189affde3879da726a5
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 May 2012 11:14:38 +0800
Tag:    v2.2.4

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

commit 4902915edbbb2fe0fabbf9b63aa86874daf5715a
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 May 2012 11:09:07 +0800
Tag:    v2.2.4

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

commit 605b5391847825540249d6644d6b187284258a76
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 May 2012 13:28:08 +0800
Tag:    v2.2.4

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

commit b51ac4e290226ae60d412bb140b5130cc2debbc7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 May 2012 13:34:24 +0800
Tag:    v2.2.4

Merge branch 'w21_MDL-32564_m22_timezonecontext' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit fee000ff4eb979ed8211b47dbad8ba7c9b4a30ea
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 May 2012 11:16:06 +0800
Tag:    v2.2.4

Merge branch 'MDL-32981-22' of github.com:FMCorz/moodle into MOODLE_22_STABLE

commit 7fcdb8275c34577f1bc10e3fc1746532a5a4534b
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 May 2012 10:28:26 +0800
Tag:    v2.2.4

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

commit 1765044c643918d250eccc0fdd9acdc1e59a5d2e
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 17 May 2012 14:30:38 +0800
Tag:    v2.2.4

Merge branch 'w20_MDL-32967_m22_sqlsrvstrings' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 573e559c96deb834a7138b4f81a0774dfab1b358
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 17 May 2012 14:11:22 +0800
Tag:    v2.2.4

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

commit f4d4fcaa41ff62ebaa824a05615e93e03098f46d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 May 2012 20:49:12 +0800
Tag:    v2.2.4

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

commit 418f8dd9a7381a8ef88bcd3100c10a396b9bb03d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 May 2012 15:53:25 +0800
Tag:    v2.2.4

Merge branch 'MDL-31719_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit 7e647445dd08bc4f08a1c18cc436d7bc9027cf95
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 May 2012 14:20:16 +0800
Tag:    v2.2.4

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

commit 97bb109b5517800a0d999216761012f349ca4dda
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 May 2012 14:12:36 +0800
Tag:    v2.2.4

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

commit a6bc302e64b667db27c117da2911e75fc4ab68a6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 May 2012 14:06:45 +0800
Tag:    v2.2.4

Merge branch 'w20_MDL-32915_m22_chatdiv' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 043a0d4c27e5a31edfc6cb28d1b8de455c84bf43
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 May 2012 14:01:03 +0800
Tag:    v2.2.4

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

commit 8dd8427aa2bde65e8520fcdd054d577ff514534a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 May 2012 13:13:06 +0800
Tag:    v2.2.4

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

commit 39a3a530696b029539298b94aec76cd285fcb9ad
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 May 2012 10:41:54 +0800
Tag:    v2.2.4

Merge branch 'MDL-32714-rubric_22' of git://github.com/mudrd8mz/moodle into MOODLE_22_STABLE