Git merges in Moodle 2.1.6 by Dan Poltawski
commit 230235e3e0d17f761fcc52ba4c52dd9acc006786
Author: Dan Poltawski <dan@moodle.com>
Date: Wed, 09 May 2012 17:46:30 +0800
Tag: v2.1.6
Merge branch 'wip-mdl-31498-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE
commit ad520779df8284958195494b23b12ec1c7387741
Author: Dan Poltawski <dan@moodle.com>
Date: Tue, 08 May 2012 12:40:45 +0800
Tag: v2.1.6
Merge branch 'w19_MDL-31691_m21_cohortidnumber' of git://github.com/skodak/moodle into MOODLE_21_STABLE
commit 3a6dc00d2aade4c072f2dc8b03caec692e7d3744
Author: Dan Poltawski <dan@moodle.com>
Date: Tue, 08 May 2012 12:36:11 +0800
Tag: v2.1.6
Merge branch 'MDL-32718-sql-typo_21' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE
commit 62e7fe190e3c7845ea5a0355b76a30e7daaf633b
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 07 May 2012 15:32:38 +0800
Tag: v2.1.6
Merge branch 'MDL-18335_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE
commit 427ef2ef69b7e4db472d939549c317204f9af79e
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 07 May 2012 13:04:06 +0800
Tag: v2.1.6
Merge branch 'MDL-32684_M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE
commit 68a2b1febf0878eb38a655e52e166c2cd3581e2d
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 07 May 2012 12:48:31 +0800
Tag: v2.1.6
Merge branch 'MDL-32430_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commit 787a484a60ccb051ecf5fc8a7d6952c5051ae38b
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 07 May 2012 11:29:15 +0800
Tag: v2.1.6
Merge branch 'mdl32379_21' of git://github.com/tlevi/moodle into MOODLE_21_STABLE
commit 22ec5e887682b331d563005caad90ae555794faf
Author: Dan Poltawski <dan@moodle.com>
Date: Tue, 01 May 2012 10:47:09 +0800
Tag: v2.1.6
Merge branch 'MDL-32181_21' of https://github.com/ppichet/moodle into MOODLE_21_STABLE
commit 43b542b6160158bc23e7a6487fe8bbed8a3922c6
Author: Dan Poltawski <dan@moodle.com>
Date: Tue, 24 Apr 2012 15:17:56 +0800
Tag: v2.1.6
Merge branch 'm21_MDL-32102' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE
commit 42657ab7ec439a5df0af8bb58834c1ad6fb83fd4
Author: Dan Poltawski <dan@moodle.com>
Date: Tue, 24 Apr 2012 10:27:27 +0800
Tag: v2.1.6
Merge branch 'w17_MDL-32427_m21_protocols' of git://github.com/skodak/moodle into MOODLE_21_STABLE
commit 2211bba99573e710f776071d02c08931d67f5246
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 23 Apr 2012 17:11:07 +0800
Tag: v2.1.6
Merge branch 'MDL-32431-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE
commit d5fabf0b1f98e168dc1fc5891847b81995a1e327
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 23 Apr 2012 16:35:39 +0800
Tag: v2.1.6
Merge branch 'w17_MDL-32477_m21_cloneperm' of git://github.com/skodak/moodle into MOODLE_21_STABLE
commit 537005082bde26fd79cf07e25a21fabc6b8c9e1d
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 23 Apr 2012 15:25:56 +0800
Tag: v2.1.6
Merge branch 'w17_MDL-31553_m21_clitimeout' of git://github.com/skodak/moodle into MOODLE_21_STABLE
commit d4ccd2ceeb47612dd7dd7a3e03c275d4c184ba12
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 23 Apr 2012 12:50:17 +0800
Tag: v2.1.6
Merge branch 'MDL-32104-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE
commit 24504b499bdc479cfdd25dd0894f90049ab016b2
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 23 Apr 2012 12:43:30 +0800
Tag: v2.1.6
Merge branch 'MDL-29262_21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE
commit fd40df6f9245bec3ad05ca29e29c6787bc91c44e
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 23 Apr 2012 10:27:56 +0800
Tag: v2.1.6
Merge branch 'MDL-23647_M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE
commit c003806b56f6f023d3ceb23267a18c135108af53
Author: Dan Poltawski <dan@moodle.com>
Date: Thu, 19 Apr 2012 17:39:34 +0800
Tag: v2.1.6
Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE
commit d89ebccf65f17e6b039f500ce8d1d79ee64447de
Author: Dan Poltawski <dan@moodle.com>
Date: Tue, 17 Apr 2012 16:08:27 +0800
Tag: v2.1.6
Merge branch 'MDL-25660-workshop-calendar_21' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE
commit 8a2b5c4525b90578d0063150f3a016fe06eae71e
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 16 Apr 2012 20:50:29 +0800
Tag: v2.1.6
Merge branch 'w16_MDL-32437_m21_tablename' of git://github.com/skodak/moodle into MOODLE_21_STABLE
commit dd9841f926189a819c95821fc1ac9e33be1daaf7
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 16 Apr 2012 14:31:26 +0800
Tag: v2.1.6
Merge branch 'MDL-32358_21' of https://github.com/ppichet/moodle into MOODLE_21_STABLE
commit bde399dcef30767796fa606c4b7015869895a09a
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 16 Apr 2012 13:29:12 +0800
Tag: v2.1.6
Merge branch 'wip-MDL-32393-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE
commit c046a3fb88352fb3b43c723f9f02e3ee43b4a284
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 16 Apr 2012 13:14:48 +0800
Tag: v2.1.6
Merge branch 'MDL-32443_m21' of git://github.com/merrill-oakland/moodle into MOODLE_21_STABLE
commit a9b71004328a4157044aaef2b156cd6e6c5d0163
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 16 Apr 2012 13:01:59 +0800
Tag: v2.1.6
Merge branch 'MDL-32404_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commit 8876dd31d8832a07c519142bb24dc74904cfa8eb
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 16 Apr 2012 10:51:53 +0800
Tag: v2.1.6
Merge branch 'MDL-32442_m21' of git://github.com/merrill-oakland/moodle into MOODLE_21_STABLE
commit 6d73da4a16fb2da6c686337fc646160f4ff60917
Author: Dan Poltawski <dan@moodle.com>
Date: Thu, 12 Apr 2012 13:00:09 +0800
Tag: v2.1.6
Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE
commit d08845f37a199a4b1c8231c56a7bd536a1a03ef3
Author: Dan Poltawski <dan@moodle.com>
Date: Wed, 11 Apr 2012 09:27:46 +0800
Tag: v2.1.6
Merge branch 'MDL-32217_21' of git://github.com/ppichet/moodle into MOODLE_21_STABLE
commit 4c9d3738db0569b42bb65979f1122828f0166eea
Author: Dan Poltawski <dan@moodle.com>
Date: Tue, 10 Apr 2012 11:06:17 +0800
Tag: v2.1.6
Merge branch 'wip-mdl-30051-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE
commit 3eaee3a914e0c4ebb20df873c2b68326b389e710
Author: Dan Poltawski <dan@moodle.com>
Date: Tue, 03 Apr 2012 11:39:28 +0800
Tag: v2.1.6
Merge branch 'wip-mdl-30904-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE
commit a76a53a6e187e27ef507d65030d3f80a6bf0d83b
Author: Dan Poltawski <dan@moodle.com>
Date: Tue, 03 Apr 2012 11:11:30 +0800
Tag: v2.1.6
Merge branch 'MDL-32220_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commit 7d7331bd7612bfd0b40480bbc7d788f4939ac8c7
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 02 Apr 2012 11:51:44 +0800
Tag: v2.1.6
Merge branch 'MDL-32039_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commit 58b4ff5039450f38f40316486fd2c8cc64bad40e
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 02 Apr 2012 10:16:31 +0800
Tag: v2.1.6
Merge branch 'wip-MDL-32264-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE
commit 5e84c2e01a6323eacf883dcf9e05e2bf92d4e818
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 02 Apr 2012 10:06:40 +0800
Tag: v2.1.6
Merge branch 'MDL-32246_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commit 9807bef7c775826c69aaa9ab5ff70521f4d45aa5
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 02 Apr 2012 09:42:59 +0800
Tag: v2.1.6
Merge branch 'MDL-32201_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commit 38dbeec003a77f7481efba9e8eff34811dc664fb
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 26 Mar 2012 14:42:07 +0800
Tag: v2.1.6
Merge branch 'MDL-31775_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE
commit 8b2aff422fc84d24f49ec184acb2cf853274f37f
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 26 Mar 2012 12:22:42 +0800
Tag: v2.1.6
Merge branch 'MDL-32172_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE
commit d6e3be6d7966d308009b870dd7f2675a4c22135e
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 26 Mar 2012 11:26:48 +0800
Tag: v2.1.6
Merge branch 'MDL-27710_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE
commit f5fd808c7a91275a68bbcd48b0e0166410b2a3c8
Author: Dan Poltawski <dan@moodle.com>
Date: Tue, 20 Mar 2012 21:55:58 +0800
Tag: v2.1.6
Merge branch 'MDL-31266_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE