Git merges in Moodle 2.1.7 by Dan Poltawski
commit d65a100e88e5b2861374e8d47fab683b1e9941b2
Author: Dan Poltawski <dan@moodle.com>
Date: Tue, 03 Jul 2012 11:51:46 +0800
Tag: v2.1.7
Merge branch 'MDL-30903-21' of git://github.com/FMCorz/moodle into MOODLE_21_STABLE
commit 7e31c3b1c3965857410c9eb5babbdaa7a466c14a
Author: Dan Poltawski <dan@moodle.com>
Date: Tue, 03 Jul 2012 11:02:23 +0800
Tag: v2.1.7
Merge branch 'MDL-30883_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commit a3039b2085a07e898d5dc5356a08acf39b12bb1b
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 02 Jul 2012 17:25:14 +0800
Tag: v2.1.7
Merge branch 'MDL-31802_21' of git://github.com/aolley/moodle into MOODLE_21_STABLE
commit 0a6a6a9cdea587a766bc18af11e48e80d24ea78d
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 02 Jul 2012 16:34:38 +0800
Tag: v2.1.7
Merge branch 'w27_MDL-34045_m21_idnumber' of git://github.com/skodak/moodle into MOODLE_21_STABLE
commit 5edb51d07251286f803dba607631dc74c4e3c5c9
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 02 Jul 2012 16:19:37 +0800
Tag: v2.1.7
Merge branch 'MDL-33924_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commit 1f4a06853702badb1b75aee52b96018ab31ee128
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 02 Jul 2012 16:07:51 +0800
Tag: v2.1.7
Merge branch 'MDL-33780_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commit a0ca809653461b05b9d546c074a45510511d223b
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 02 Jul 2012 15:43:49 +0800
Tag: v2.1.7
Merge branch 'MDL-30008-21' of git://github.com/FMCorz/moodle into MOODLE_21_STABLE
commit e059f69d3f991e6caa2f770f0d2b2ec3ba13d1d9
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 02 Jul 2012 15:34:39 +0800
Tag: v2.1.7
Merge branch 'MDL-9073-21' of github.com:FMCorz/moodle into MOODLE_21_STABLE
commit 706c814d8c6e047e2f5cd431352b1e40994efdc7
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 02 Jul 2012 15:13:05 +0800
Tag: v2.1.7
Merge branch 'MDL-31987_assignment_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE
commit 722efe6e5b24b69623f68346a3a7cc0e5f520f75
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 02 Jul 2012 11:27:42 +0800
Tag: v2.1.7
Merge branch 'MDL-27842-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE
commit 3546266a6bc049889363f7a1415233f6904a9c3f
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 25 Jun 2012 21:58:20 +0800
Tag: v2.1.7
Merge branch 'MDL-33984_21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE
commit e13939dc773a51143ac42d73a066ff371a451d95
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 25 Jun 2012 18:47:20 +0800
Tag: v2.1.7
Merge branch 'MDL-33984_21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE
commit 1cdcf60ed3d3a851db1b8a5f9785ef6d4ba97003
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 18 Jun 2012 15:07:52 +0800
Tag: v2.1.7
Merge branch 'wip-MDL-33603-MOODLE_21_STABLE' of git://github.com/abgreeve/moodle into MOODLE_21_STABLE
commit 47e26d45f7b5b677d8324ea2cb6fc7458da4d379
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 18 Jun 2012 14:34:43 +0800
Tag: v2.1.7
Merge branch 'wip-mdl-33607-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE
commit 19b1f96f1f238a38452210b991722e4f8b94f62a
Author: Dan Poltawski <dan@moodle.com>
Date: Thu, 14 Jun 2012 12:29:27 +0800
Tag: v2.1.7
Merge branch 'MDL-33035-m21' of git://github.com/sunner/moodle into MOODLE_21_STABLE
commit 05fc59ef64fc4f1dd8e0c6acf08194426b17b6b9
Author: Dan Poltawski <dan@moodle.com>
Date: Wed, 13 Jun 2012 17:45:44 +0800
Tag: v2.1.7
Merge branch 'MDL-33581-MOODLE_21_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_21_STABLE
commit 965481f7fb96e343e8c94f967f2908a595261489
Author: Dan Poltawski <dan@moodle.com>
Date: Thu, 07 Jun 2012 22:23:56 +0800
Tag: v2.1.7
Merge branch 'MDL-33532_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commit 296d5c07d8d29ccdf9f39d8df043789c95a707fe
Author: Dan Poltawski <dan@moodle.com>
Date: Tue, 05 Jun 2012 11:58:49 +0800
Tag: v2.1.7
Merge branch 'MDL-30880_feedback_property_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE
commit f83ecb3721d11323910fe974429c4fc04a2afbf7
Author: Dan Poltawski <dan@moodle.com>
Date: Tue, 05 Jun 2012 09:35:47 +0800
Tag: v2.1.7
Merge branch 'MDL-31460_unsubscribe_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE
commit ca409b9b44edf95a1a9d717f5b880a45eb6762c3
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 04 Jun 2012 16:22:20 +0800
Tag: v2.1.7
Merge branch 'MDL-29173_calc_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE
commit 4a126d26cf91db3135a0f9412780f89142460d1c
Author: Dan Poltawski <dan@moodle.com>
Date: Thu, 31 May 2012 16:59:44 +0800
Tag: v2.1.7
Merge branch 'MDL-33434_21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE
commit 01ab2bb505a46b5120a440f968d167af26d4ec4c
Author: Dan Poltawski <dan@moodle.com>
Date: Wed, 30 May 2012 11:36:04 +0800
Tag: v2.1.7
Merge branch 'MDL-33398b-21' of git://github.com/srynot4sale/moodle into MOODLE_21_STABLE
commit e3d8f34ad6b152b9dca456f62dee283b0a256111
Author: Dan Poltawski <dan@moodle.com>
Date: Tue, 29 May 2012 16:20:44 +0800
Tag: v2.1.7
Merge branch 'MDL-30905-21' of git://github.com/FMCorz/moodle into MOODLE_21_STABLE
commit e2eaa0bae41f9e25f957f74dfe9c1b0bb9c46f1a
Author: Dan Poltawski <dan@moodle.com>
Date: Tue, 29 May 2012 16:11:14 +0800
Tag: v2.1.7
Merge branch 'wip-mdl-33102-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE
commit 5013a713ebd9a84854926cbea3e1238092346e8b
Author: Dan Poltawski <dan@moodle.com>
Date: Tue, 29 May 2012 15:12:49 +0800
Tag: v2.1.7
Merge branch 'MDL-30888-21' of git://github.com/FMCorz/moodle into MOODLE_21_STABLE
commit 573a933e42ad6a40db03d4a7b7dc371b8ab355e8
Author: Dan Poltawski <dan@moodle.com>
Date: Tue, 29 May 2012 15:11:07 +0800
Tag: v2.1.7
Merge branch 'MDL-33212-m21' of git://github.com/sammarshallou/moodle into MOODLE_21_STABLE
commit 1cbf87e8dbe6d1f8619084400507fd699b8ae4e3
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 28 May 2012 16:05:11 +0800
Tag: v2.1.7
Merge branch 'MDL-33352-MOODLE_21_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_21_STABLE
commit 382b95d29233be5a28bf5ce2705a920e2a485332
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 28 May 2012 16:03:19 +0800
Tag: v2.1.7
Merge branch 'MDL-33212-m21' of git://github.com/sammarshallou/moodle into MOODLE_21_STABLE
commit 29010d3e532b38e2510e1b055cec8b17e0fa2137
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 28 May 2012 15:24:40 +0800
Tag: v2.1.7
Merge branch 'MDL-31393_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commit b269d8f988bd592efe28cbdc48aaa92ff01b10d0
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 28 May 2012 15:19:03 +0800
Tag: v2.1.7
Merge branch 'wip-MDL-32199-MOODLE_21_STABLE' of git://github.com/abgreeve/moodle into MOODLE_21_STABLE
commit 093e1ce8dfd161f7d1bc3add9ee00dad24e350d3
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 28 May 2012 14:33:05 +0800
Tag: v2.1.7
Merge branch 'm21_MDL-27368' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE
commit c02287f3337e1a607b58c5476f3170bc4ba4c08f
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 28 May 2012 12:16:41 +0800
Tag: v2.1.7
Merge branch 'MDL-29173_calc_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE
commit 4e9869158700b407a9b31b276cdeed2dc2692682
Author: Dan Poltawski <dan@moodle.com>
Date: Fri, 25 May 2012 11:14:48 +0800
Tag: v2.1.7
Merge branch 'MDL-29924-21' of git://github.com/FMCorz/moodle into MOODLE_21_STABLE
commit 497288882ad7e0813955f7ab26a8b412b2af9a10
Author: Dan Poltawski <dan@moodle.com>
Date: Fri, 25 May 2012 11:09:21 +0800
Tag: v2.1.7
Merge branch 'MDL-28557-21' of git://github.com/bostelm/moodle into MOODLE_21_STABLE
commit 6645da5bce602237bce451b0525f2159643e36e6
Author: Dan Poltawski <dan@moodle.com>
Date: Wed, 23 May 2012 13:28:14 +0800
Tag: v2.1.7
Merge branch 'wip-mdl-32155-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE
commit 6e4bb45785a961c34cc6e71035a47c16e56a2408
Author: Dan Poltawski <dan@moodle.com>
Date: Tue, 22 May 2012 13:34:29 +0800
Tag: v2.1.7
Merge branch 'w21_MDL-32564_m21_timezonecontext' of git://github.com/skodak/moodle into MOODLE_21_STABLE
commit 2aa58eb6ce02b928b5d73475152e17211320729c
Author: Dan Poltawski <dan@moodle.com>
Date: Thu, 17 May 2012 14:11:32 +0800
Tag: v2.1.7
Merge branch 'MDL-31814_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commit 53ce4f035e4ca831f683c2f7308b9bd9c5a0d3af
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 14 May 2012 20:49:19 +0800
Tag: v2.1.7
Merge branch 'MDL-32863_21' of git://github.com/jonof/moodle into MOODLE_21_STABLE
commit 6e49419bda4e7ff298455a443c174a1a14e97c32
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 14 May 2012 15:53:30 +0800
Tag: v2.1.7
Merge branch 'MDL-31719_M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE
commit 5701bc74a0a9a62cf658c0d89e8de7ba86403825
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 14 May 2012 14:12:46 +0800
Tag: v2.1.7
Merge branch 'MDL-24401_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE
commit 821e7135035cfc6159f06d74fb3bde87d52e98af
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 14 May 2012 14:06:59 +0800
Tag: v2.1.7
Merge branch 'w20_MDL-32915_m21_chatdiv' of git://github.com/skodak/moodle into MOODLE_21_STABLE
commit 51c048b088c35fb0e62262fc7e0d28272bdc59fb
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 14 May 2012 14:01:08 +0800
Tag: v2.1.7
Merge branch 'wip-MDL-32872-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE
commit 5f70593f945dd81b4f4c9d34684ddcd5b67146be
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 14 May 2012 13:13:11 +0800
Tag: v2.1.7
Merge branch 'wip-MDL-32611-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE
commit ac6f7b2c969d1b082eb4121c415356cf993d9f80
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 14 May 2012 10:42:00 +0800
Tag: v2.1.7
Merge branch 'MDL-32714-rubric_21' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE