Git merges in Moodle 2.2.3 by Dan Poltawski

commit b37bb96b0f2cf8b18b68a2e77d056f70968f456d
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 May 2012 17:46:15 +0800
Tag:    v2.2.3

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

commit 1357fde40995c3c1e4832efe79b78e567f964f09
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 May 2012 10:28:55 +0800
Tag:    v2.2.3

Merge branch 'w19_MDL-32733_m22_authorizemessage' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit c0ba02d066da2d183d93d01ed335a1eb36bf9e4b
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 May 2012 10:22:55 +0800
Tag:    v2.2.3

Merge branch 'w19_MDL-32775_m22_searchpix' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit d6a84028e5eaefbd9bc17ace74f0fa149affeec2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 May 2012 12:40:39 +0800
Tag:    v2.2.3

Merge branch 'w19_MDL-31691_m22_cohortidnumber' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 22f754bae6702852d81100aa80cf21daa1de8870
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 May 2012 12:35:56 +0800
Tag:    v2.2.3

Merge branch 'MDL-32718-sql-typo_22' of git://github.com/mudrd8mz/moodle into MOODLE_22_STABLE

commit 4b641eaf823b09a5485da0ce612b85ce6285e556
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 May 2012 15:32:31 +0800
Tag:    v2.2.3

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

commit e71b8ccbd19ef24a799b47c753f946d73184b729
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 May 2012 13:03:57 +0800
Tag:    v2.2.3

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

commit 9d669d60bd0331de437303e683b2930230d2d367
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 May 2012 12:48:24 +0800
Tag:    v2.2.3

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

commit 35f7fa3d36635d68898a7f0a2d3ccb431500f7dd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 May 2012 11:29:09 +0800
Tag:    v2.2.3

Merge branch 'mdl32379_22' of git://github.com/tlevi/moodle into MOODLE_22_STABLE

commit 8589241024fe88730fb2f9c1a300b2071cea4ebc
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 24 Apr 2012 15:17:51 +0800
Tag:    v2.2.3

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

commit d25f6a8ecbd1b004ec9d54dcbfe47341d350226f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 24 Apr 2012 10:27:22 +0800
Tag:    v2.2.3

Merge branch 'w17_MDL-32427_m22_protocols' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 1d6070951a35c02b636bf14a96f8cbeefa23a60d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 24 Apr 2012 10:23:34 +0800
Tag:    v2.2.3

Merge branch 'w17_MDL-25407_m22_innodb' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 1e13c7b154003ebea71d0cc9d656efbd5b610735
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Apr 2012 17:10:57 +0800
Tag:    v2.2.3

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

commit ac05e65ef21c23f15f0ce1ee0518cc2416612029
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Apr 2012 16:35:34 +0800
Tag:    v2.2.3

Merge branch 'w17_MDL-32477_m22_cloneperm' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 7b969f0bb0ba56c49dbf92de4703340273dd8a16
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Apr 2012 15:25:49 +0800
Tag:    v2.2.3

Merge branch 'w17_MDL-31553_m22_clitimeout' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 4be12986aa3eb80be86185729ad24a3ed441cd39
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Apr 2012 12:54:07 +0800
Tag:    v2.2.3

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

commit 2d3659da69b23a4134efc280fc5891df77915b6f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Apr 2012 12:50:02 +0800
Tag:    v2.2.3

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

commit 7c4e7f8fdfe9f3e15dcfeed9c4bf7ee46423572e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Apr 2012 12:42:33 +0800
Tag:    v2.2.3

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

commit ced892ebb2211ffc215abe8e09114d9871be5eb1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Apr 2012 12:24:48 +0800
Tag:    v2.2.3

Merge branch 'w17_MDL-25407_m22_innodb' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit d97f2caf135e8290806a718d058fdffef103cdbb
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Apr 2012 10:27:51 +0800
Tag:    v2.2.3

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

commit d6f387e26264264735c2f5e47e7922c81901855c
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 19 Apr 2012 17:39:12 +0800
Tag:    v2.2.3

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit 35eb31fa38c11af51f29317285ee09a19931c98a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 17 Apr 2012 16:07:12 +0800
Tag:    v2.2.3

Merge branch 'MDL-25660-workshop-calendar_22' of git://github.com/mudrd8mz/moodle into MOODLE_22_STABLE

commit 36ddd604b5a6256ce2407c905a9821bf3fbd9d1e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 16 Apr 2012 20:50:25 +0800
Tag:    v2.2.3

Merge branch 'w16_MDL-32437_m22_tablename' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 1399a5bc4175b20df20459892ecc4a2d4df85ebd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 16 Apr 2012 14:31:17 +0800
Tag:    v2.2.3

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

commit afa1de62b278512e3771b33d326590e1127d5fbf
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 16 Apr 2012 13:29:07 +0800
Tag:    v2.2.3

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

commit ddbc74866d8580285c6b0981188d6ac4f38437aa
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 16 Apr 2012 13:14:42 +0800
Tag:    v2.2.3

Merge branch 'MDL-32443_m22' of git://github.com/merrill-oakland/moodle into MOODLE_22_STABLE

commit d4608845b23f594a55d62dbf20f8373d1c4c6107
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 16 Apr 2012 13:01:52 +0800
Tag:    v2.2.3

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

commit 253b5f4d7e71a5fbc5da349b4a8a69bc7e81f037
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 16 Apr 2012 10:51:46 +0800
Tag:    v2.2.3

Merge branch 'MDL-32442_m22' of git://github.com/merrill-oakland/moodle into MOODLE_22_STABLE

commit dc201dce9e7d4e7f6cf23553506cefca69a3ebf2
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 12 Apr 2012 12:59:46 +0800
Tag:    v2.2.3

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit b0a994f4603fb51b63896bbb630daaf183788137
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 11 Apr 2012 09:27:38 +0800
Tag:    v2.2.3

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

commit 697f104ac1f329bf365fdcb86a6d8cd3358066e8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Apr 2012 11:06:09 +0800
Tag:    v2.2.3

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

commit a028969cc7a5d3fb84400db4ae14e08ad9dd1362
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Apr 2012 11:39:21 +0800
Tag:    v2.2.3

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

commit 65e5640a94c0d864649039672022340ff63beac0
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Apr 2012 11:10:19 +0800
Tag:    v2.2.3

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

commit 41b4bb03b2f14b7eb15a5a3ee0c04331fcd96bad
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Apr 2012 11:50:50 +0800
Tag:    v2.2.3

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

commit 17ee774fdfc4316fb6a11ddce05c7075ce1f55da
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Apr 2012 11:02:37 +0800
Tag:    v2.2.3

Merge branch 'MDL-32214' of git://github.com/mkassaei/moodle into MOODLE_22_STABLE

commit 94bea73f29b83382be6091159ee33e1ef0acba97
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Apr 2012 10:16:50 +0800
Tag:    v2.2.3

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

commit d54abc73a197d70b935a763ea05cc4cfd49bd4cf
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Apr 2012 10:06:23 +0800
Tag:    v2.2.3

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

commit 46303d1deb19d1caac99c613c5138ea6d2ccc503
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Apr 2012 09:42:37 +0800
Tag:    v2.2.3

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

commit 59fccfb0cfb03f159a19bd738b80f6fad83cd2c5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Mar 2012 14:47:44 +0800
Tag:    v2.2.3

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

commit e0f6644dc0ee6bf334f70b62656303b5057a8ad7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Mar 2012 14:41:46 +0800
Tag:    v2.2.3

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

commit 26420be6105026d186a17ff6d7c44e72780897b7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Mar 2012 12:22:57 +0800
Tag:    v2.2.3

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

commit 4270267ee9795dc20e99fa1f8d946a8093034bc3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Mar 2012 12:11:18 +0800
Tag:    v2.2.3

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

commit 55878aa09b08cbe4c793b81402bd58ae0dd51426
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Mar 2012 11:27:38 +0800
Tag:    v2.2.3

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

commit 91e79a37cca29a48a0dc59fc2f9c6df90b00718f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Mar 2012 21:45:03 +0800
Tag:    v2.2.3

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