Git merges in Moodle 2.0.x by Sam Hemelryk
commit 453e17a1595da026eeafcae2a63ab02a85cfbee7
Author: Sam Hemelryk <sam@moodle.com>
Date: Fri, 06 Jul 2012 05:47:50 +0800
Tag: v2.0.10
Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE
commit ba22fd2f1b89afb50ab47d5417a3cf2f8a12851f
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 02 Jul 2012 10:31:11 +0800
Tag: v2.0.10
Merge branch 'MDL-33932_20' of git://github.com/grabs/moodle into MOODLE_20_STABLE
commit b7ab2a33f93bf0374f6aee68fc08880fd097b7c5
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 02 Jul 2012 10:05:25 +0800
Tag: v2.0.10
Merge branch 'MDL-33627_20' of git://github.com/grabs/moodle into MOODLE_20_STABLE
commit 42fe1f5e073bfce177e732abcd92034e17567db0
Author: Sam Hemelryk <sam@moodle.com>
Date: Thu, 21 Jun 2012 07:38:45 +0800
Tag: v2.0.10
Merge branch 'MDL-27675_20' of git://github.com/grabs/moodle into MOODLE_20_STABLE
commit 657db60a9929769102846d4686c982ba58d120b5
Author: Sam Hemelryk <sam@moodle.com>
Date: Fri, 23 Mar 2012 07:10:14 +0800
Tag: v2.0.9
Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE
commit 3a14100d8d6c8add091ab51f263e54a93534aef8
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 20 Mar 2012 06:39:33 +0800
Tag: v2.0.9
Merge branch 'w12_MDL-32071_m20_dbfamily' of git://github.com/skodak/moodle into MOODLE_20_STABLE
commit f436d12c6020929a2d00ed7b73eb152b80b547ee
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 19 Mar 2012 15:33:23 +0800
Tag: v2.0.9
Merge branch 'w12_MDL-32090_m20_groupui' of git://github.com/skodak/moodle into MOODLE_20_STABLE
commit da27633d029f2ab922f49de08ed9199711566bbd
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 05 Mar 2012 11:55:34 +0800
Tag: v2.0.8
Merge branch 'w10_MDL-31807_m20_cohort' of git://github.com/skodak/moodle into MOODLE_20_STABLE
commit 131e9f7fb95241ade10711db89769e9c7ef58f50
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 05 Mar 2012 08:53:23 +0800
Tag: v2.0.8
Merge branch 'MDL-29248_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE
commit 7f68eb8e2cfd35ec7773315a9ae07704b2b8726d
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 14 Feb 2012 10:31:40 +0800
Tag: v2.0.8
Merge branch '20_MDL-26807_remove_withselectedusers_strings_and_references' of git://github.com/gerrywastaken/moodle into MOODLE_20_STABLE
commit 9de39056a6b6c05ed93537826dd76e28faa5347d
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 14 Feb 2012 10:27:36 +0800
Tag: v2.0.8
Merge branch '20_MDL-27285_fixing_grammar_on_wiki_links_page' of git://github.com/gerrywastaken/moodle into MOODLE_20_STABLE
commit 573123929de4b7a51cde2174b2acf8fc6f78f3ad
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 14 Feb 2012 10:20:49 +0800
Tag: v2.0.8
Merge branch '20_MDL-27654_add_space_to_somefieldrequired_string' of git://github.com/gerrywastaken/moodle into MOODLE_20_STABLE
commit 3445e851044f386a03bcddb63f5cdb9a3b698da0
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 13 Feb 2012 12:34:22 +0800
Tag: v2.0.8
Merge branch 'wip-MDL-25185-MOODLE_20_STABLE' of git://github.com/abgreeve/moodle into MOODLE_20_STABLE
commit 69fd20dc1979bb2ee07731313b171728a0271de5
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 13 Feb 2012 12:02:15 +0800
Tag: v2.0.8
Merge branch 'wip-MDL-31463-MOODLE_20_STABLE' of git://github.com/abgreeve/moodle into MOODLE_20_STABLE
commit 67e79df3e24371fefb76820a624906d244ca6613
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 13 Feb 2012 09:35:47 +0800
Tag: v2.0.8
Merge branch 'MDL-25883-20' of https://github.com/mackensen/moodle into MOODLE_20_STABLE
commit 032d7039fdff34786c2b245520c701596a436cf2
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 04 Jan 2012 05:58:01 +0800
Tag: v2.0.7
Merge branch 'w52_MDL-29917_m20_autocomplete' of git://github.com/skodak/moodle into MOODLE_20_STABLE
commit 3cd88ea638e2ac9756a0475494aabbb98ace3d4b
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 21 Dec 2011 12:19:46 +0800
Tag: v2.0.7
Merge branch 'MDL-28126_m20' of https://github.com/nebgor/moodle into MOODLE_20_STABLE
commit 91af0d84312e1f9450fb69788281f61a6b6f6559
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 21 Dec 2011 10:01:14 +0800
Tag: v2.0.7
Merge branch 'MDL-29239_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE
commit 834082292adafb903810e0f628316d1c6b26b158
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 20 Dec 2011 08:20:38 +0800
Tag: v2.0.7
Merge branch 'MDL-30646_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE
commit ffcc16f52a23be39661af96c75ea495a763d25e3
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 20 Dec 2011 05:42:15 +0800
Tag: v2.0.7
Merge branch 'wip-MDL-28948-MOODLE_20_STABLE' of git://github.com/abgreeve/moodle into MOODLE_20_STABLE
commit a3c0ea64af32c159edbc006bb2cdcf92e979d0df
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 14 Dec 2011 09:24:46 +0800
Tag: v2.0.7
Merge branch 'MDL-30463_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE
commit 2a6811bb9db0cecab98e6333b84bf862769b980a
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 13 Dec 2011 06:26:34 +0800
Tag: v2.0.7
Merge branch 'MDL-30689' of git://github.com/timhunt/moodle into MOODLE_20_STABLE
commit b11d9dc5955795257057cc8683f3624de48b117e
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 13 Dec 2011 06:19:36 +0800
Tag: v2.0.7
Merge branch 'MDL-30677_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE
commit 3a4e0dd4d3385fb38f56a43928273096eb6b84cd
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 13 Dec 2011 06:10:52 +0800
Tag: v2.0.7
Merge branch 'MDL-30498a_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE
commit 4a0b3e2a6214799e885abb85b4df2a3265602d5b
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 13 Dec 2011 05:25:58 +0800
Tag: v2.0.7
Merge branch 'MDL-27143_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE
commit 1114c49f51f052e21646c398891717a3aa37ba59
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 12 Dec 2011 09:57:09 +0800
Tag: v2.0.7
Merge branch 'MDL-28180_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE
commit c4a91d06701d7b5c20c88c32269fff64e8bd7747
Author: Sam Hemelryk <sam@moodle.com>
Date: Fri, 09 Dec 2011 06:43:41 +0800
Tag: v2.0.7
Merge branch 'MDL-30660' of git://github.com/timhunt/moodle
commit 3b1a4a0d55173ce7f99ebd0ad6e7c89428b02c3d
Author: Sam Hemelryk <sam@moodle.com>
Date: Thu, 08 Dec 2011 07:42:20 +0800
Tag: v2.0.7
Merge branch 'MDL-29712-MOODLE_20_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_20_STABLE
commit 2316dcf0a8733a8ba95a016850c70db10fb40bdc
Author: Sam Hemelryk <sam@moodle.com>
Date: Thu, 08 Dec 2011 05:47:59 +0800
Tag: v2.0.7
Merge branch 'm20_MDL-30211' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE
commit 8eaf6d689b0916d6435920b4e588b6504952e816
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 07 Dec 2011 09:20:03 +0800
Tag: v2.0.7
Merge branch 'wip-MDL-19147-MOODLE_20_STABLE' of git://github.com/abgreeve/moodle into MOODLE_20_STABLE
commit ebaa82b5da325321a19f35e056a182f26b3e121b
Author: Sam Hemelryk <sam@moodle.com>
Date: Thu, 01 Dec 2011 10:49:10 +0800
Tag: v2.0.7
Merge branch 'wip-mdl-30421-m20' of git://github.com/rajeshtaneja/moodle into MOODLE_20_STABLE
commit 0e1cdd9e4309eb82bb733dd78d24c61a8bc9e89a
Author: Sam Hemelryk <sam@moodle.com>
Date: Thu, 01 Dec 2011 10:19:56 +0800
Tag: v2.0.7
Merge branch 'wip-MDL-30469-MOODLE_20_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_20_STABLE
commit 088b648cccc20b4c06045353cad67cf4175a597a
Author: Sam Hemelryk <sam@moodle.com>
Date: Thu, 01 Dec 2011 07:29:57 +0800
Tag: v2.0.7
Merge branch 'MDL-29730_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE
commit bd87b71c4df50614a085349eea5e8177c4d37598
Author: Sam Hemelryk <sam@moodle.com>
Date: Thu, 01 Dec 2011 07:16:23 +0800
Tag: v2.0.7
Merge branch 'MDL-30453-exassessment-link_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE
commit 6c5ba86e356e1d06f424c5f58051b7ba47700297
Author: Sam Hemelryk <sam@moodle.com>
Date: Thu, 01 Dec 2011 06:50:24 +0800
Tag: v2.0.7
Merge branch 'MDL-30271-switch-role-workshop_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE
commit de8b419b608bdd728f806e6926b7990e1a21307b
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 30 Nov 2011 06:43:18 +0800
Tag: v2.0.7
Merge commit 'FETCH_HEAd' into MOODLE_20_STABLE
commit dc558d2882c9860a2b13d3713cb736efd05cf634
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 30 Nov 2011 06:37:49 +0800
Tag: v2.0.7
Merge branch 'MDL-30287_grader_ajax_20' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE
commit 7231e48c27af1e92c497f4752dfe8a6c650c7fa0
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 29 Nov 2011 11:41:07 +0800
Tag: v2.0.7
Merge branch 'wip-MDL-30273-MOODLE_20_STABLE' of git://github.com/abgreeve/moodle into MOODLE_20_STABLE
commit b40a3260612a590b46671ea63fc016ff39248b7c
Author: Sam Hemelryk <sam@moodle.com>
Date: Fri, 25 Nov 2011 07:45:07 +0800
Tag: v2.0.6
Merge branch 'MDL-26431-20' of git://github.com/totara/moodle into MOODLE_20_STABLE
commit e1a236015c64ae9353c1b6b718bcbc9ba33bd78c
Author: Sam Hemelryk <sam@moodle.com>
Date: Fri, 25 Nov 2011 06:59:42 +0800
Tag: v2.0.6
Merge branch 'MDL-29115_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE
commit 1ee341b3d1ec588245445cca71095f7bf85e0a9b
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 23 Nov 2011 09:20:34 +0800
Tag: v2.0.6
Merge branch 'MDL-30192_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE
commit d019d13ea1545203d5daeb2583e5eb1ac4f9989b
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 23 Nov 2011 08:58:15 +0800
Tag: v2.0.6
Merge branch 'MDL-29904-M20' of git://github.com/lazydaisy/moodle into MOODLE_20_STABLE
commit f68144c177664fd2002f19ebe2f847d87a94bd7d
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 22 Nov 2011 13:28:11 +0800
Tag: v2.0.6
Merge branch 'MDL-28629_MOODLE_20_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_20_STABLE
commit 63526f3e9be473b658888becc7a5707025cf8f54
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 22 Nov 2011 07:59:52 +0800
Tag: v2.0.6
Merge branch 'MDL-30392_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE
commit 5174eeebe3bac77c9dd4e92cf8dc4dda220cd4b1
Author: Sam Hemelryk <sam@moodle.com>
Date: Thu, 17 Nov 2011 08:10:53 +0800
Tag: v2.0.6
Merge branch 'MDL-29893-m20' of git://github.com/ankitagarwal/moodle into MOODLE_20_STABLE
commit c0e1de9b0062442819a647bfe4721fd1187d8431
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 14 Nov 2011 12:51:06 +0800
Tag: v2.0.6
Merge branch 'MDL-28670_m20' of git://github.com/nebgor/moodle into MOODLE_20_STABLE
commit 06b4c6e13a506c4cc8eab0b5877be782239301bf
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 14 Nov 2011 07:14:47 +0800
Tag: v2.0.6
Merge branch 'wip-MDL-30010-M20' of git://github.com/lazydaisy/moodle into MOODLE_20_STABLE
commit 7352bbbc6a24963ae41b7bf5fdb1242e3ec3a9d1
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 08 Nov 2011 08:09:29 +0800
Tag: v2.0.6
Merge branch 'MDL-25823_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE
commit 7f5380be082f4c48cb6bff70b54b22c6fe0ad4f8
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 08 Nov 2011 07:00:42 +0800
Tag: v2.0.6
Merge branch 'MDL-29420-m20' of git://github.com/ankitagarwal/moodle into MOODLE_20_STABLE
commit fb3bf9a0d2acba2e242ee11ce9e76928284e0941
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 07 Nov 2011 07:24:15 +0800
Tag: v2.0.6
Merge branch 'wip-MDL-28292-stable20' of git://github.com/phalacee/moodle into MOODLE_20_STABLE
commit 57b290b458002d1933909ef06c611d69dcd4e109
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 07 Nov 2011 06:41:18 +0800
Tag: v2.0.6
Merge branch 'MDL-29955_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE
commit 16d1e22c102f68252a9d0f3504aca6bcc90c5736
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 01 Nov 2011 11:54:03 +0800
Tag: v2.0.6
Merge branch 'w43_MDL-29980_m20_flowcss' of git://github.com/skodak/moodle into MOODLE_20_STABLE
commit 3a7d4b4b3d1267a67d57f28787104c9c59183842
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 01 Nov 2011 11:11:04 +0800
Tag: v2.0.6
Merge branch 'MDL-29197-M20' of git://github.com/lazydaisy/moodle into MOODLE_20_STABLE
commit 2b7b20dea91bd4a2ce8f7063248de751a773ac71
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 01 Nov 2011 10:58:28 +0800
Tag: v2.0.6
Merge branch 'MDL-25760_M20' of git://github.com/lazydaisy/moodle into MOODLE_20_STABLE
commit 0bc3cbc276a346fe04b5f3a1ebea9df668d9ad35
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 01 Nov 2011 04:37:55 +0800
Tag: v2.0.6
Merge branch 'w43_MDL-29925_m20_calendar' of git://github.com/skodak/moodle into MOODLE_20_STABLE
commit f909700aff7892eae8a2bb0374f2b9b7d61be847
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 31 Oct 2011 12:09:41 +0800
Tag: v2.0.6
Merge branch 'MDL-29810-20' of git://github.com/bostelm/moodle into MOODLE_20_STABLE
commit 6cedec7615cfe0fdb2483bce4224a517c0579491
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 31 Oct 2011 08:05:35 +0800
Tag: v2.0.6
Merge branch 'MDL-30006-workshop-grades_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE
commit f672031f54179d10ab20c35a1969df7a83c939c5
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 31 Oct 2011 08:00:25 +0800
Tag: v2.0.6
Merge branch 'm20_MDL-28559' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE
commit d6261cf8c6f46bb37263f57bf97bf6005e3365ca
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 26 Oct 2011 05:43:59 +0800
Tag: v2.0.6
Merge branch 'MDL-29569_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE
commit abd481c63e4f73ea53f1736a08684cbdeab52e76
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 25 Oct 2011 10:44:40 +0800
Tag: v2.0.6
Merge branch 'MDL-28324_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE
commit 88507c00633d12005449dd0f846d4032713a9dd8
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 25 Oct 2011 10:19:33 +0800
Tag: v2.0.6
Merge branch 'wip-MDL-29231-stable20' of git://github.com/phalacee/moodle into MOODLE_20_STABLE
commit 13df91ba6d88de124c1480c03895563c62933856
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 17 Oct 2011 13:51:40 +0800
Tag: v2.0.6
Merge branch 'MDL-28170_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE
commit d951bc52acc58655b4ceeb4566d32fcbbd60b52c
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 17 Oct 2011 12:36:52 +0800
Tag: v2.0.6
Merge branch 'MDL-26953-M20' of git://github.com/lazydaisy/moodle into MOODLE_20_STABLE
commit 9bb0bf92abc0f5af15842a127af4b2e218bcffb6
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 17 Oct 2011 10:17:14 +0800
Tag: v2.0.6
Merge branch 'MDL-29781-M20' of git://github.com/lazydaisy/moodle into MOODLE_20_STABLE
commit 14c31e18290d04d6a37fba4adde867ea636091b7
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 17 Oct 2011 08:55:41 +0800
Tag: v2.0.6
Merge branch 'MDL-26893-M20' of git://github.com/lazydaisy/moodle into MOODLE_20_STABLE
commit 2f922905150122404dfdf019e055422313cef127
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 11 Oct 2011 05:44:53 +0800
Tag: v2.0.6
Merge branch 'MDL-29454_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE
commit 787fc502ad7c19386b0903491d90b0f6d2e8a4ac
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 10 Oct 2011 12:57:18 +0800
Tag: v2.0.6
Merge branch 'MDL-16553-20' of git://github.com/bostelm/moodle into MOODLE_20_STABLE
commit 9f46908ac48b03c632fdcca5b15146622bfe132b
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 10 Oct 2011 07:09:06 +0800
Tag: v2.0.6
Merge branch 'MDL-29668_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE
commit dbd95c2aca6eac724ab6a93123ecdb21c3f48f0d
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 10 Oct 2011 07:02:26 +0800
Tag: v2.0.6
Merge branch 'MDL-29677_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE
commit 019e897604d6759dd1ce1ac0a10c23fe02123693
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 04 Oct 2011 12:58:07 +0800
Tag: v2.0.5
Merge branch 'MDL-29621_20_wip' of git://github.com/grabs/moodle into MOODLE_20_STABLE
commit c03a8543f0b01c169237a2060b3208a28afe2c7e
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 04 Oct 2011 11:21:48 +0800
Tag: v2.0.5
Merge branch 'MDL-28725_wiki_section2_20' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE
commit 77738c4562b63db42c08f211e54de26bd42600fb
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 03 Oct 2011 12:09:35 +0800
Tag: v2.0.5
Merge branch 'MDL-29296_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE
commit e93dd0d65092ad281daace30a379da2844887224
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 03 Oct 2011 10:10:05 +0800
Tag: v2.0.5
Merge branch 'wip-mdl-29539-m20' of git://github.com/rajeshtaneja/moodle into MOODLE_20_STABLE
commit d6a7cac9915458531f41cfd332b217f0d16d1210
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 03 Oct 2011 09:38:14 +0800
Tag: v2.0.5
Merge branch 'MDL-28566-M20' of git://github.com/lazydaisy/moodle into MOODLE_20_STABLE
commit ec9b8fb68d275cc5087bb90e1e774c76b083478a
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 03 Oct 2011 09:30:26 +0800
Tag: v2.0.5
Merge branch 'MDL-29323-M20' of git://github.com/lazydaisy/moodle into MOODLE_20_STABLE
commit 8bd76f9e652e621411ba2d0b9403b9423cc87462
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 03 Oct 2011 09:23:59 +0800
Tag: v2.0.5
Merge branch 'wip-MDL-25454-MOODLE_20_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_20_STABLE
commit c06645a5396b4f974b69d293df7f779344617508
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 03 Oct 2011 08:23:37 +0800
Tag: v2.0.5
Merge branch 'MDL-29567_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE
commit 85906b4ae5e16f0070fccd85254407432fabe3e6
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 03 Oct 2011 07:50:10 +0800
Tag: v2.0.5
Merge branch 'MDL-29566_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE
commit 424cb3b0efd3fed4ed78f7fc6296d0bdd6a66715
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 03 Oct 2011 07:28:27 +0800
Tag: v2.0.5
Merge branch 'MDL-29618_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE
commit a53366f7ab139da664e063c5a0be29cfa2294f14
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 27 Sep 2011 09:17:36 +0800
Tag: v2.0.5
Merge branch 'm20_MDL-29519' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE
commit bacfad505d0b152da13f6019ae5fbd207ed0f7d3
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 27 Sep 2011 06:17:59 +0800
Tag: v2.0.5
Merge branch 'MDL-29411_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE
commit 5ea58ff4e14a6454e9fa0cce41062e0e4d413228
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 26 Sep 2011 07:36:18 +0800
Tag: v2.0.5
Merge branch 'MDL-29336-numerrors-mapping-20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE
commit 3603e0856ac993521f9be8b76a13d8edab8b7ba6
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 26 Sep 2011 05:45:57 +0800
Tag: v2.0.5
Merge branch 'MDL-29139_m20' of git://github.com/nebgor/moodle into MOODLE_20_STABLE
commit 91c578c06dcd8c2aea282393d8199a22ce871ea6
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 26 Sep 2011 05:39:41 +0800
Tag: v2.0.5
Merge branch 'MDL-29190_20_wip' of git://github.com/grabs/moodle into MOODLE_20_STABLE
commit 5e51b68a1867529f3b22cc487620f7ea044ffc3b
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 20 Sep 2011 08:13:29 +0800
Tag: v2.0.5
Merge branch 'MDL-26841_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE
commit 024315981725216edee5af96c5b777cc7e5e0bb4
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 20 Sep 2011 07:59:03 +0800
Tag: v2.0.5
Merge branch 'MDL-29392_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE
commit f6b9535c4bd3011b3fe74a7ade2c5684f5384690
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 19 Sep 2011 13:00:23 +0800
Tag: v2.0.5
Merge branch 'wip-mdl-25937-m20' of git://github.com/rajeshtaneja/moodle into MOODLE_20_STABLE
commit 62920e80bace2288de29bd5d01901df1d745b56c
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 12 Sep 2011 16:27:41 +0800
Tag: v2.0.5
Merged branch 'MDL-22232_easier_turn_off_notifications_20' from git://github.com/andyjdavis/moodle.git with conflict resolution
commit 5fbc1470b10ac2d43642c2401f9115847cfa6341
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 12 Sep 2011 15:49:46 +0800
Tag: v2.0.5
Merge branch 'MDL-29211_M20' of git://github.com/kordan/moodle into MOODLE_20_STABLE
commit 52c00a59c67263176d820c0bce438185d389f98f
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 12 Sep 2011 13:26:44 +0800
Tag: v2.0.5
Merge branch 'MDL-28724_m20' of git://github.com/nebgor/moodle into MOODLE_20_STABLE
commit 13b7a5d4e5d137bf87a1c87564c36ddfff8167be
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 12 Sep 2011 10:39:42 +0800
Tag: v2.0.5
Merge branch 'MDL-27635_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE
commit f4aea09ea4b974b615f5913642b4d3ca0b7cc837
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 12 Sep 2011 10:31:03 +0800
Tag: v2.0.5
Merge branch 'w36_MDL-29312_m20_cookieless' of git://github.com/skodak/moodle into MOODLE_20_STABLE
commit ef9d05cd990ad4a958bbc58eb48703b898268797
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 12 Sep 2011 09:21:01 +0800
Tag: v2.0.5
Merge branch 'MDL-28488_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE
commit f364f5628f7c28724b853be62a9d888c252e309c
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 05 Sep 2011 12:08:13 +0800
Tag: v2.0.5
Merge branch 'MDL-29018_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE
commit 2c90eef264e84a4bc4d39fd6341022837b7adef1
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 05 Sep 2011 12:03:12 +0800
Tag: v2.0.5
Merge branch 'MDL-28689_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE
commit b1e71dac7d5c279eda4863740338b8b3cb4ee2db
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 05 Sep 2011 09:37:13 +0800
Tag: v2.0.5
Merge branch 'MDL-27975_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE
commit 96083d8068751732110e21851ddbdc1fc066dc8b
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 29 Aug 2011 09:05:38 +0800
Tag: v2.0.5
Merge branch 'MDL-26819_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE
commit 31bb03f6e1e2286812de559cbd2571d4e86a1e26
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 29 Aug 2011 08:55:00 +0800
Tag: v2.0.5
Merge branch 'dev_MDL-27289_boxnet_20' of git://github.com/dongsheng/moodle into MOODLE_20_STABLE
commit d3e5802d97f3e95d5d755294eced9903e0f84d58
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 29 Aug 2011 08:25:16 +0800
Tag: v2.0.5
Merge branch 'MDL-29135-mnet-login_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE
commit 3e7ff59eb43d3e5280c9e3f589d8ab116cee1d7b
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 10 Aug 2011 14:10:41 +0800
Tag: v2.0.5
Merge branch 'MDL-20501_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE
commit 47a6e69179282a89e2176e93de13e0a4e9a97947
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 08 Aug 2011 14:00:08 +0800
Tag: v2.0.5
Merged branch 'MDL-28575_MOODLE_20_STABLE' of git://github.com/kordan/moodle.git with conflict resolution
commit 4ecd7134e5d4f6ee7e2d289bbc5c01397960b1ea
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 08 Aug 2011 13:45:05 +0800
Tag: v2.0.5
Merge branch 'MDL-28587_MOODLE_20_STABLE' of git://github.com/kordan/moodle into MOODLE_20_STABLE
commit 3bbbd26ee6546c8d607d56aac03138662997887e
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 08 Aug 2011 11:19:18 +0800
Tag: v2.0.5
Merge branch 'MDL-28406_block_duplicate_20' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE
commit 81c77993e3808bba68fe24d6bfbac19a41679a6f
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 08 Aug 2011 10:47:21 +0800
Tag: v2.0.5
Merge branch 'w31_MDL-27586_m20_browser' of git://github.com/skodak/moodle into MOODLE_20_STABLE
commit 6aec4988125e7180dd0c590c643680ae028f918d
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 08 Aug 2011 10:25:55 +0800
Tag: v2.0.5
Merge branch 'w31_MDL-27685_m20_pglike' of git://github.com/skodak/moodle into MOODLE_20_STABLE
commit 11909e87a0a9ac1b7226f2c1edb8070666778555
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 08 Aug 2011 10:21:05 +0800
Tag: v2.0.5
Merge branch 'w31_MDL-28382_m20_iis' of git://github.com/skodak/moodle into MOODLE_20_STABLE
commit 48db633522c0c9d433563ef32c73c627a374d9d9
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 08 Aug 2011 10:09:56 +0800
Tag: v2.0.5
Merge branch 'w31_MDL-28450_m20_defgroup' of git://github.com/skodak/moodle into MOODLE_20_STABLE
commit 0f68bcbc52b3c9d68a79877987c4c187ac2c9441
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date: Tue, 02 Aug 2011 17:47:13 +0800
Tag: v2.0.5
Merge branch 'MDL-28508_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE
commit c440ddfb583b2c600a2b814b9950a71106235806
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date: Tue, 02 Aug 2011 16:59:08 +0800
Tag: v2.0.5
Merge branch 'MDL-28340_advanced_search_other_users_20' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE
commit 6a60e3f282a20c745970e4397988df2ad2546972
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date: Tue, 02 Aug 2011 16:52:22 +0800
Tag: v2.0.5
Merge branch 'wip-mdl-28504-m20' of git://github.com/rajeshtaneja/moodle into MOODLE_20_STABLE
commit f15c1b78ab16078b750381f17c9af31cc0f244b4
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date: Tue, 02 Aug 2011 16:44:33 +0800
Tag: v2.0.5
Merge branch 'wip-MDL-19907-M00DLE_20_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_20_STABLE
commit 43b2bb6cd9f0893d15f0cbde32eb495fac92f6b7
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date: Tue, 02 Aug 2011 16:36:16 +0800
Tag: v2.0.5
Merge branch 'wip-MDL-27122-MOODLE_20_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_20_STABLE
commit 7d5f92870e62c787f46d8dba595397586d1790e8
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date: Tue, 02 Aug 2011 14:09:57 +0800
Tag: v2.0.5
Merge branch 'wip-MDL-27754-MOODLE_20_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_20_STABLE
commit e99d784ffe338bdb9692ae3166a4877657180f7f
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date: Tue, 02 Aug 2011 13:41:36 +0800
Tag: v2.0.5
Merge branch 's11_MDL-28284_filepicker_module_20' of git://github.com/dongsheng/moodle into MOODLE_20_STABLE
commit 25f8084ba0914723636280f64b7670cc7898e0fa
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date: Tue, 02 Aug 2011 13:38:00 +0800
Tag: v2.0.5
Merge branch 'MDL-28510_20_STABLE' of git://github.com/marxjohnson/moodle into MOODLE_20_STABLE
commit 187c395673de6b479cd908f6dc33a7de144636b1
Author: unknown <SamandJen1@.(none)>
Date: Tue, 02 Aug 2011 13:27:00 +0800
Tag: v2.0.5
Merge branch 'm20_MDL-27876' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE
commit d5addee28fea58601389435e81e85ebc4eddc865
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date: Tue, 02 Aug 2011 12:22:57 +0800
Tag: v2.0.5
Merge branch 'MDL-28487-typo_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE
commit a8562f6c0163bc9876beb9c5bc6d6d5c10ef9eb0
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date: Tue, 02 Aug 2011 11:49:21 +0800
Tag: v2.0.5
Merged branch 'm20_MDL-28548' of git://github.com/danmarsden/moodle.git with comment changes
commit 03e29fff56afe783ced154d196a70043a119ab29
Author: Sam Hemelryk <sam@moodle.com>
Date: Fri, 29 Jul 2011 10:13:30 +0800
Tag: v2.0.4
Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE
commit 213eaa94f6fac90816d988769de7846c94217236
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 25 Jul 2011 15:14:39 +0800
Tag: v2.0.4
Merge branch 'MDL-28107_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE
commit 2e3a96e192efa81f4e07965573210a91b6cf8060
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 25 Jul 2011 11:18:45 +0800
Tag: v2.0.4
Merge branch 'w29_MDL-22584_m20_monsterpaths' of git://github.com/skodak/moodle into MOODLE_20_STABLE
commit 417fdfab6bbdcfc3f5b64704ec06912ae9cd1050
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 25 Jul 2011 11:04:02 +0800
Tag: v2.0.4
Merge branch 'w29_MDL-27464_m20_continue' of git://github.com/skodak/moodle into MOODLE_20_STABLE
commit 77c9ae457d432cb46256e1bde776ce31f171259c
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 25 Jul 2011 10:59:30 +0800
Tag: v2.0.4
Merge branch 'w29_MDL-27653_m20_usercasting' of git://github.com/skodak/moodle into MOODLE_20_STABLE
commit a8fd6146e7e4efa229bc7b344da14d215501f504
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 25 Jul 2011 10:55:12 +0800
Tag: v2.0.4
Merge branch 'w29_MDL-27796_m20_httphost' of git://github.com/skodak/moodle into MOODLE_20_STABLE
commit 538e680d39a6c03467f0be701757ea53b8007869
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 25 Jul 2011 10:45:51 +0800
Tag: v2.0.4
Merge branch 'w29_MDL-27994_m20_creatorcaps' of git://github.com/skodak/moodle into MOODLE_20_STABLE
commit ec5f521a59b6e103fa831fb95e1bc8c12f2dae04
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 25 Jul 2011 10:40:00 +0800
Tag: v2.0.4
Merge branch 'w29_MDL-28145_m20_renderer' of git://github.com/skodak/moodle into MOODLE_20_STABLE
commit 100308ce24e441fb7a1f2d4408d465529613a2d1
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 25 Jul 2011 10:37:05 +0800
Tag: v2.0.4
Merge branch 'w29_MDL-28182_m20_userdel' of git://github.com/skodak/moodle into MOODLE_20_STABLE
commit f6fc3616de8cedddfa6e9ddccf2344c0037b778c
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 25 Jul 2011 10:15:05 +0800
Tag: v2.0.4
Merge branch 'w29_MDL-28384_m20_nullurl' of git://github.com/skodak/moodle into MOODLE_20_STABLE
commit 9a8343cdde5388fe39527f613585398d55c96fa9
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 25 Jul 2011 09:53:02 +0800
Tag: v2.0.4
Merge branch 'w29_MDL-28432_m20_cohortconfig' of git://github.com/skodak/moodle into MOODLE_20_STABLE
commit a4e3607a212ca3ee9bd0d87e7fbbff9437329075
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 25 Jul 2011 09:45:53 +0800
Tag: v2.0.4
Merge branch 'w29_MDL-28440_m20_jssemicol' of git://github.com/skodak/moodle into MOODLE_20_STABLE
commit a6c44179e52ab474ef829c17b3e1e8cd72e8e2d2
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date: Mon, 18 Jul 2011 22:48:11 +0800
Tag: v2.0.4
Merge branch 'w28_MDL-28363_m20_dimmed' of git://github.com/skodak/moodle into MOODLE_20_STABLE
commit ab93b029191f038a17946cb2bc93d6c0fd3a529d
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date: Mon, 18 Jul 2011 22:40:22 +0800
Tag: v2.0.4
Merge branch 'MDL-28298-workshop-constant_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE
commit 07ea543a1c60a2a6caa223890d66b65ad1335103
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date: Mon, 18 Jul 2011 22:35:16 +0800
Tag: v2.0.4
Merge branch 'MDL-28325-enrol-help_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE
commit ef5a198d1c5ad2078a6f0e244777f9db0b78a367
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date: Mon, 18 Jul 2011 20:20:13 +0800
Tag: v2.0.4
Merge branch 'wip-MDL-27756-MOODLE_20_STABLE' of github.com:marinaglancy/moodle into MOODLE_20_STABLE
commit 60e7f2b113d95c164ff0fc65b422f4e953164bdb
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date: Mon, 18 Jul 2011 19:51:39 +0800
Tag: v2.0.4
Merge branch 'MDL-27555_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE
commit 68bc5b7b681e2aae9ab4a4f5e9a0419fc31a7778
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date: Mon, 18 Jul 2011 18:19:51 +0800
Tag: v2.0.4
Merge branch 'w28_MDL-27804_m20_csvauth' of git://github.com/skodak/moodle into MOODLE_20_STABLE
commit 45222fc50f71d318ffb3ca339d0180b0de982ec3
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date: Mon, 18 Jul 2011 18:10:30 +0800
Tag: v2.0.4
Merge branch 'w28_MDL-28253_m20_managerupgrade' of git://github.com/skodak/moodle into MOODLE_20_STABLE
commit 78092d6742abb7a16a4a260e24bfb7e7fcee1ed3
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date: Mon, 18 Jul 2011 18:04:32 +0800
Tag: v2.0.4
Merge branch 'w28_MDL-28313_m20_enroldb' of git://github.com/skodak/moodle into MOODLE_20_STABLE
commit a3fe5348ab2c07316091d8c64c0e33afccdd55d3
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date: Mon, 18 Jul 2011 17:39:56 +0800
Tag: v2.0.4
Merge branch 'w28_MDL-28348_m20_meta' of git://github.com/skodak/moodle into MOODLE_20_STABLE
commit e3f6f3089673ba492ec3ea918a0213564825aed4
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date: Mon, 18 Jul 2011 17:29:01 +0800
Tag: v2.0.4
Merge branch 'w28_MDL-28350_m20_wsra' of git://github.com/skodak/moodle into MOODLE_20_STABLE
commit b22eb6a987361a5ad73ac2b670d0cdfb77ec3288
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 13 Jul 2011 20:09:42 +0800
Tag: v2.0.4
Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE
commit 77de688b8231e2628543c29cdab45f9e183d2f3c
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 11 Jul 2011 16:02:00 +0800
Tag: v2.0.4
Merge branch 'wip-mdl-27954-MOODLE_20_STABLE' of git://github.com/rajeshtaneja/moodle into MOODLE_20_STABLE
commit dd8e61891791602deaab6795071fab08cf9baa6f
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 11 Jul 2011 14:54:48 +0800
Tag: v2.0.4
Merge branch 'MDL-28227_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE
commit 05deeaacdb5b52e0ae0c2743bf5c0743e51fe25a
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 11 Jul 2011 11:32:04 +0800
Tag: v2.0.4
Merge branch 'm20_MDL-27947' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE
commit 19dd6873771054df938f9e640a99f0672f1aeef9
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 11 Jul 2011 11:04:35 +0800
Tag: v2.0.4
Merge branch 'mod_url_decode_m20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE
commit f2c12522c3676889b6c6c780f90b8bd588fe59e3
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 11 Jul 2011 10:57:33 +0800
Tag: v2.0.4
Merge branch 'backup_groups_m20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE
commit 668a9eb90b18f09da15af45797fe32ec0d5e2b2b
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 06 Jul 2011 12:11:14 +0800
Tag: v2.0.4
Merge branch 'MDL-27716_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE
commit ed26ad33caaedfd4cbbb2312ae13261a7293857f
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 06 Jul 2011 11:05:11 +0800
Tag: v2.0.4
Merge branch 'MDL-28135_MOODLE_20_STABLE' of git://github.com/nebgor/moodle into MOODLE_20_STABLE
commit 39025fe1775c5aa2c5ad217e41560d9f32506eef
Author: Sam Hemelryk <sam@moodle.com>
Date: Fri, 01 Jul 2011 15:08:59 +0800
Tag: v2.0.4
Merge branch 's11_MDL-28121_split_20' of github.com:dongsheng/moodle into MOODLE_20_STABLE
commit 4a7e2298a3e0edca4a8e28e916261f0ba2805717
Author: Sam Hemelryk <sam@moodle.com>
Date: Thu, 30 Jun 2011 10:50:10 +0800
Tag: v2.0.4
Merge branch 'MDL-24684_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE
commit abfe9dbe6e3027e31c9ab0e3025c518f67f0977d
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 28 Jun 2011 17:05:41 +0800
Tag: v2.0.4
Merge branch 'MDL-28023_assignment_jabber_20' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE
commit 8c75bb59760322872f970c006227f5abfd0f460a
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 28 Jun 2011 10:17:48 +0800
Tag: v2.0.4
Merge branch 's11_MDL-27866_pix_url_20' of git://github.com/dongsheng/moodle into MOODLE_20_STABLE
commit e78632643cac442014ffbb3a65aded1f659d508b
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 28 Jun 2011 10:13:15 +0800
Tag: v2.0.4
Merge branch 'MDL-28014_stable' of git://github.com/grabs/moodle into MOODLE_20_STABLE
commit d9c19266c80a1e436810ed935bf93655c367590b
Author: Sam Hemelryk <sam@moodle.com>
Date: Thu, 23 Jun 2011 10:44:32 +0800
Tag: v2.0.4
Merge branch 'MDL-27169_m20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE
commit 8445c4724c4e2ec7b5a7e23ed66230f6f6602d55
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 22 Jun 2011 17:16:00 +0800
Tag: v2.0.4
Merge branch 'MDL-27966_m20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE
commit 3e6c1d4d55b34bf437ef836f4c6adc4a91588098
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 22 Jun 2011 17:10:53 +0800
Tag: v2.0.4
Merge branch 'MDL-25811_m20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE
commit 97161e50081668b5b5b1453676fa017bcc341d08
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 14 Jun 2011 09:48:57 +0800
Tag: v2.0.4
Merge branch 'MDL-27286_m20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE
commit c1d93d47e960af78f95252fccd4dd1f6babef54c
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 13 Jun 2011 15:09:16 +0800
Tag: v2.0.4
Merged branch 'MDL-26960-for-20_STABLE' of git://git.luns.net.uk/moodle with changes
commit 6160c1721c17fe43cf4f3c6902495be0ca51a35e
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 13 Jun 2011 14:54:06 +0800
Tag: v2.0.4
Merge branch 'm20_MDL-27404' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE
commit 71472b0a8263d6a4d334456a65e3e41144e8f370
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 13 Jun 2011 11:32:55 +0800
Tag: v2.0.4
Merge branch 'MDL-16168-CAS-crash-if-no-LDAP-20' of https://github.com/iarenaza/moodle into MOODLE_20_STABLE
commit ba3721d4636ab9bb87f884c7fe0dff13934276ef
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 13 Jun 2011 11:18:48 +0800
Tag: v2.0.4
Merge branch 'MDL-27757-20' of git://github.com/srynot4sale/moodle into MOODLE_20_STABLE
commit 1a1f7b0eec2dd40484dae378846d5d51a103c5ce
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 13 Jun 2011 11:14:02 +0800
Tag: v2.0.4
Merge branch 'MDL-27783-20STABLE' of git://github.com/mouneyrac/moodle into MOODLE_20_STABLE
commit 79121602c45da2cac7641908005a9e6b919c109e
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 13 Jun 2011 10:35:55 +0800
Tag: v2.0.4
Merged branch 'MDL-27801_MOODLE_20_STABLE' of git://github.com/kordan/moodle.git with changes
commit bca840b4bc8362b3c3063b07cf0c42cdba35a2fa
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 08 Jun 2011 16:32:18 +0800
Tag: v2.0.4
Merged branch 'MDL-27695_MOODLE_20_STABLE' of git://github.com/nebgor/moodle.git with changes
commit 80406e9dd8ef2d0b7adac08f285ad5a42824fdd0
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 08 Jun 2011 13:52:39 +0800
Tag: v2.0.4
Merge branch 'MDL-27737_2.0' of git://github.com/timhunt/moodle into MOODLE_20_STABLE
commit f4c5e5044024dea21dbaed80e502715b5f6c2ddb
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 08 Jun 2011 13:51:10 +0800
Tag: v2.0.4
Merged branch 'MDL-25775_stable' of git://github.com/grabs/moodle.git
commit 1382f8a549c1847ec894e6ef0b296f4498bfb5fd
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 08 Jun 2011 13:43:51 +0800
Tag: v2.0.4
Merged branch 'MDL-27118-MOODLE_20_STABLE' of git://github.com/epsd/moodle.git
commit f279137a862f879dd78049b4950dfd0b42cd7633
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 08 Jun 2011 13:39:29 +0800
Tag: v2.0.4
Merge branch 'MDL-27294-MOODLE_20_STABLE' of git://github.com/epsd/moodle into MOODLE_20_STABLE
commit f2ba68efc1955e0ecc7d32f51e910ed2446093b9
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 08 Jun 2011 13:04:57 +0800
Tag: v2.0.4
Merged branch 'MDL-27692' of git://github.com/MaryE/moodle.git
commit 629ea4957bcd720b95d0e1022f67df3ec720ffa8
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 08 Jun 2011 11:31:14 +0800
Tag: v2.0.4
Merge branch 'MDL-25477-MOODLE_20_STABLE' of git://github.com/epsd/moodle into MOODLE_20_STABLE
commit 4c1db5b4eab0e1b25ae5bda1618729e5a009986d
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 07 Jun 2011 16:31:38 +0800
Tag: v2.0.4
Merged branch 's9_MDL-26392_wiki_files_20' from git://github.com/dongsheng/moodle.git with fixes
commit 7ea0f8e5196609fe975514d7bdf9d9e979b15aaa
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 07 Jun 2011 16:25:14 +0800
Tag: v2.0.4
Merge branch 'MDL-27734-workshop-example-weight_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE
commit ece057943d1fcab25c61619c36e8861b4615a266
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 07 Jun 2011 16:22:49 +0800
Tag: v2.0.4
Merge branch 'MDL-27733-workshop-deadlines_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE
commit edb8d49d3503f074ada266270a0a65b90bf1786a
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 07 Jun 2011 16:14:52 +0800
Tag: v2.0.4
Merge branch 'MDL-27732-glossary-introformat_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE
commit 8c23e3f5ffdaab6c596e78c4acee6d6ad8418e2d
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 07 Jun 2011 16:11:33 +0800
Tag: v2.0.4
Merge branch 'admin_whitespace_cleanup_m20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE
commit 98c1207c46f799c911b8c4c4158ae23e36ee6202
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 30 May 2011 17:22:41 +0800
Tag: v2.0.4
Merge branch 'wip-mdl-27603-MOODLE_20_STABLE' of git://github.com/rajeshtaneja/moodle into MOODLE_20_STABLE
commit 3466a42f31a6357a1618cb98a6af450674d8c312
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 30 May 2011 13:07:24 +0800
Tag: v2.0.4
Merge branch 'MDL-25512' of git://github.com/MaryE/moodle.git
commit 2e8ab7269c33a3900266317e5202713dd67fb8bf
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 30 May 2011 09:33:19 +0800
Tag: v2.0.4
Merge branch 'MDL-27636_20stable' of git://github.com/stronk7/moodle into MOODLE_20_STABLE
commit 72ca02b0b27a3c3a347add35d5cc5ea1a90ab47c
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 30 May 2011 09:04:34 +0800
Tag: v2.0.4
Merge branch 'MDL-27009' of git://github.com/aolley/moodle into MOODLE_20_STABLE
commit f9ba5c522270c07c1068565efbbe8204033c6b37
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 23 May 2011 11:34:29 +0800
Tag: v2.0.4
Merge branch 'm20_MDL-25177_choice_windowfix' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE
commit f79dd3b57d8c5dd68bc013a1d09417ec385e2a7b
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 23 May 2011 11:25:25 +0800
Tag: v2.0.4
Merge branch 'MDL-27530_stable' of git://github.com/grabs/moodle into MOODLE_20_STABLE
commit c7d4a92ccf12121d4139dd8edcfba217f73dda19
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 16 May 2011 12:32:12 +0800
Tag: v2.0.4
Merge branch 'MDL-27161_m20' of git://github.com/rwijaya/moodle.git
commit 5bd0e7af9fb0770a84439e44a8279fa34acc720e
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 16 May 2011 12:16:26 +0800
Tag: v2.0.4
Merge branch 'MDL-27387_rating_scale_validation' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE
commit 794fb0e5656826797b0d009abcfa230f2a818122
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 16 May 2011 12:10:58 +0800
Tag: v2.0.4
Merge branch 'MDL-26075_stable' of git://github.com/grabs/moodle
commit 633fcef536806e187562618050649cc6080845d2
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 10 May 2011 09:54:15 +0800
Tag: v2.0.4
Merge branch 'MDL-27140_m20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE
commit 6867fc94b79b5cd1aee382fc408e426767cd6ec7
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 09 May 2011 10:52:22 +0800
Tag: v2.0.4
Merge branch 'MDL-27325_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE
commit 8385249f5b09c75f05f15fa02c3b0c0e2435249a
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 09 May 2011 10:22:20 +0800
Tag: v2.0.4
Merge branch 'MDL-27367-20' of git://github.com/srynot4sale/moodle into MOODLE_20_STABLE
commit 36f0835e7271abfff017dfc8ef662e0c786aeba5
Author: Sam Hemelryk <sam@moodle.com>
Date: Thu, 05 May 2011 13:26:46 +0800
Tag: v2.0.3
Merge branch 's9_MDL-27382_dropbox_get_file_fix_20' of github.com:dongsheng/moodle into MOODLE_20_STABLE
commit 259b9d05f33a1c6ef39ecdf8cec7c8dfae7b911e
Author: Sam Hemelryk <sam@moodle.com>
Date: Thu, 05 May 2011 13:23:22 +0800
Tag: v2.0.3
Merge branch 's9_MDL-27381_overwrite_dialog_safari_20' of github.com:dongsheng/moodle into MOODLE_20_STABLE
commit da20cd7b43ae0ef311c1b49bef9ef95ce6a95a86
Author: Sam Hemelryk <sam@moodle.com>
Date: Thu, 05 May 2011 11:46:05 +0800
Tag: v2.0.3
Merge branch 's9_MDL-26854_spam_comments_20_2' of git://github.com/dongsheng/moodle into MOODLE_20_STABLE
commit 7390fdde6305fc1d83a48ecce48a1607ad9972e8
Author: Sam Hemelryk <sam@moodle.com>
Date: Thu, 05 May 2011 10:42:58 +0800
Tag: v2.0.3
Merge branch 's9_MDL-26854_spam_comments_20_2' of git://github.com/dongsheng/moodle into MOODLE_20_STABLE
commit 1374c61bb423b86890fabd61e40f17e23ea0ce21
Author: Sam Hemelryk <sam@moodle.com>
Date: Thu, 05 May 2011 10:19:54 +0800
Tag: v2.0.3
Merge branch 'MDL-26838_ratings_bad_data3' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE
commit c44a5d5946b0ae35ce3687bbfff46f087474b23f
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 04 May 2011 13:56:59 +0800
Tag: v2.0.3
Merge branch 's10_MDL-27330_dropbox_authorization_url_20' of github.com:dongsheng/moodle into MOODLE_20_STABLE
commit 0baa1eee59d045a2d7b3e5976d3d771042ab329a
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 03 May 2011 16:28:38 +0800
Tag: v2.0.3
Merged MDL-26388 Fixed whitespace
commit 6a48b42ae8f8dfc6b04fb1db8660f26424e9b195
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 03 May 2011 15:42:26 +0800
Tag: v2.0.3
Merge branch 'MDL-25805_MOODLE_20_STABLE' of git://github.com/nebgor/moodle into MOODLE_20_STABLE
commit 2dd90f136cae695b6d12b60204868eca176496f1
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 03 May 2011 11:00:15 +0800
Tag: v2.0.3
Merge branch 'MDL-26628' of git://github.com/srynot4sale/moodle into MOODLE_20_STABLE
commit e6647397b9061c7bfa16400f5d99de8e2daa60c4
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 03 May 2011 10:54:44 +0800
Tag: v2.0.3
Merged MDL-27251 Fixed up whitespace, Fixed broken string, reworded new strings
commit e3cc5b1a7f7d51669314bb4400b30aa9fe6d7f29
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 02 May 2011 15:00:54 +0800
Tag: v2.0.3
Merged changes and fixed whitespace issues for MDL-23188
commit 0742ea86b20c6ada06f3ac1e41882bc5a126786d
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 02 May 2011 14:23:06 +0800
Tag: v2.0.3
Merge branch 'MDL-26955-themedir-plugindirectory_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE
commit 41f79b5c07c81a48341a83464c2f871d64b76292
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 02 May 2011 14:12:45 +0800
Tag: v2.0.3
Merge branch 'MDL-27116-themedir-config_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE
commit ed85c0acd249997d9b042de782c9c6ba39d86deb
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 02 May 2011 14:09:26 +0800
Tag: v2.0.3
Merge branch 'MDL-27155_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE
commit 9c39028179679a10c3fe47f12917bb239e323686
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 02 May 2011 12:14:05 +0800
Tag: v2.0.3
Merge branch 'MDL-27246-cutomlang-version_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE
commit 2715f9693283c038e95f30cf8d65b899e2a9c339
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 19 Apr 2011 16:29:49 +0800
Tag: v2.0.3
Merged with small fix branch MDL-26516_m20_calevent_wip4 from git://github.com/rwijaya/moodle.git
commit a4b65c11b9e6d240b86042e030562f398aa812e3
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 19 Apr 2011 10:46:54 +0800
Tag: v2.0.3
Merged with conflict resolution branch MDL-26835_MASTER_grader_highlight_suspended_users from git://github.com/andyjdavis/moodle.git
commit e6cf40de7881a96c49824cdfb68895d4ee27614b
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 19 Apr 2011 10:26:30 +0800
Tag: v2.0.3
Merge branch 'MDL-25999_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE
commit 6f8081bef474eb48aad54b7b52104b3ce4b1239b
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 18 Apr 2011 10:57:27 +0800
Tag: v2.0.3
MDL-26958 PULL-675 Merged changes and removed border colour style
commit 465846f0823dd34370cc36197fef7ac95b9bfca4
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 11 Apr 2011 15:38:48 +0800
Tag: v2.0.3
Merge branch 'MDL-25746_m20' of git://github.com/nebgor/moodle into MOODLE_20_STABLE
commit 67b5d74b2ce9cb3ecc15de2e8c6f488abbc980de
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 11 Apr 2011 14:34:57 +0800
Tag: v2.0.3
Merge branch 'MDL-27034_xhprof_table_sql_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE
commit 7d1fb2f6eca79ebccb733aab17252eb8cb8c54f9
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 11 Apr 2011 11:54:50 +0800
Tag: v2.0.3
Merged branch 'MDL-26185_m20' of git://github.com/andyjdavis/moodle.git and fixed conflicts
commit 227e54d65ad118394abf8823c61c8dcdc289bd50
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 11 Apr 2011 11:38:21 +0800
Tag: v2.0.3
Merge branch 'MDL-27063' of git://github.com/MaryE/moodle into MOODLE_20_STABLE
commit 728f3c9d0843e2f2969380ba82eae158d56ec412
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 04 Apr 2011 13:21:24 +0800
Tag: v2.0.3
Merge branch 'MDL-26185_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE
commit 13c53a4a2ec225ae637bdee74a250849ec7f970e
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 28 Mar 2011 14:33:27 +0800
Tag: v2.0.3
Merge branch 'w13_MDL-26992_20_uploadtemplates' of git://github.com/skodak/moodle into MOODLE_20_STABLE
commit d3796a2c61d01ee7007ccdda6a36b7fd71a50e99
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 28 Mar 2011 14:17:08 +0800
Tag: v2.0.3
Merge branch 'w13_MDL-26989_20_enrolroles' of git://github.com/skodak/moodle into MOODLE_20_STABLE
commit 8196e3c08dcd1cb6027cac122fc722e84595108f
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 21 Mar 2011 17:32:06 +0800
Tag: v2.0.3
Merge branch 'MDL-26557' of git://git.luns.net.uk/moodle
commit 587a4ee42cf6ebec89619a3341e5a2370083da71
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 21 Mar 2011 17:23:13 +0800
Tag: v2.0.3
Merge branch 'MDL-26827' of git://git.luns.net.uk/moodle
commit c889fb83724801568472442d5fe2a85019912cbd
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 21 Mar 2011 17:19:06 +0800
Tag: v2.0.3
Merge branch 'w12_MDL-26904_20_PHPLOL' of git://github.com/skodak/moodle
commit beb81f4947043cc0746ef58128a7901ae204f24e
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 21 Mar 2011 17:13:20 +0800
Tag: v2.0.3
Merged PULL-496/MDL-26859 and fixed incorrect defines
commit ee780aeeaf8efb310d6f22eaba8b51d0fca530e0
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 21 Mar 2011 16:50:07 +0800
Tag: v2.0.3
Merge branch 'w12_MDL-26876_20_blogformat' of git://github.com/skodak/moodle
commit d9738e84d6695fecc7727ebae3478faf707eb9c8
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 21 Mar 2011 15:58:19 +0800
Tag: v2.0.3
Merged PULL-480/MDL-24877 and bumped version number to fix conflict
commit 161ba40d03b06e5da387b2ef7a4a77ef532063bb
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 21 Mar 2011 15:47:36 +0800
Tag: v2.0.3
Merge branch 'w12_MDL-26808_20_enrolpageurl' of git://github.com/skodak/moodle
commit ca3fce634f0fe9944636aa5a5f9f92ddac8a249b
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 21 Mar 2011 14:27:45 +0800
Tag: v2.0.3
Merge branch 'w12_MDL-26826_20_youtubedim' of git://github.com/skodak/moodle
commit 909fc3ff2e0195303e7f371c41d647134c817993
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 21 Mar 2011 14:16:51 +0800
Tag: v2.0.3
Merge branch 'w12_MDL-26726_20_typocat' of git://github.com/skodak/moodle
commit e460480080d59dc601f90efee639057faf5a6f60
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 21 Mar 2011 14:10:44 +0800
Tag: v2.0.3
Merge branch 'w12_MDL-26825_20_cancelform' of git://github.com/skodak/moodle
commit d1f54251711221e031dad49b25485f89485a97a4
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 21 Mar 2011 13:37:36 +0800
Tag: v2.0.3
Merge branch 'w12_MDL-26837_20_algebra' of git://github.com/skodak/moodle
commit 1698268db1795145f485550a63dca9f86ae38878
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 21 Mar 2011 13:30:59 +0800
Tag: v2.0.3
Merge branch 'w12_MDL-26834_20_inactiveparticipants' of git://github.com/skodak/moodle
commit 885e86b108b5cb8fff0148c2d7e0fcea7f36c053
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 21 Mar 2011 12:36:47 +0800
Tag: v2.0.3
Merge branch 'w12_MDL-26833_20_inactiveforum' of git://github.com/skodak/moodle
commit 37fff873983974bf0227d815b136b5d35a122c7e
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 21 Mar 2011 12:28:45 +0800
Tag: v2.0.3
Merge branch 'w12_MDL-26803_20_userupload' of git://github.com/skodak/moodle
commit b89d39bfcb7ce8b001c10e21de3b15dce7056382
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 21 Mar 2011 12:22:23 +0800
Tag: v2.0.3
Merge branch 'w12_MDL-26842_20_ociparams' of git://github.com/skodak/moodle
commit 9d61397181ed38dbee538140867ca4088041dbec
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 21 Mar 2011 11:54:20 +0800
Tag: v2.0.3
Merge branch 'MDL-26607_search_error' of git://github.com/andyjdavis/moodle
commit 0235bd87067090fd32c6db81ebd8e699e0affa6f
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 21 Mar 2011 11:16:50 +0800
Tag: v2.0.3
Merged MDL-25565 PULL-451 and fixed conflicts
commit f786f011153d5f43c0a2e0ab43096319d458d801
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 14 Mar 2011 18:02:18 +0800
Tag: v2.0.3
Merge rebased branch 'formal_white_2011030507' of git://github.com/kordan/moodle.git
commit e96aa1a669d163cc592b24fb29c9e4a183dfc7a0
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 14 Mar 2011 16:05:37 +0800
Tag: v2.0.3
Merge branch 's7_MDL-26583_filepicker_lang' of git://github.com/dongsheng/moodle
commit 4bbe460316e7e596dff847a5a2ad229f0a476f2f
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 14 Mar 2011 15:41:51 +0800
Tag: v2.0.3
Merge branch 'w11_MDL-26480_20_redirect' of git://github.com/skodak/moodle
commit 85f1abe30422e861b294d7314fa4b5a99d34b62b
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 14 Mar 2011 15:33:49 +0800
Tag: v2.0.3
Merge branch 'MDL-13983' of git://github.com/timhunt/moodle
commit 9fed82de9c76058c93ea6086a240278c4080049d
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 14 Mar 2011 11:22:05 +0800
Tag: v2.0.3
Merge branch 'MDL-26785' of git://github.com/stronk7/moodle
commit 2012d82a96df0384ed29c8fde334b6a5b3fd1afd
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 14 Mar 2011 10:59:58 +0800
Tag: v2.0.3
Fixed merge conflicts in nonzero theme
commit 66c6e870ef541ce17f43d3363aba65eca066a2f6
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 14 Mar 2011 10:54:24 +0800
Tag: v2.0.3
Merge branch 'MDL-25304' of git://github.com/epsd/moodle
commit b146486613ad4fa32f46e9d798bed112e6098a9b
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 14 Mar 2011 10:43:42 +0800
Tag: v2.0.3
Merge branch 'MDL-25786-2' of git://github.com/epsd/moodle
commit e9fda1c9452c4ebb4e72dd7aa6414893bf860191
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 14 Mar 2011 10:36:17 +0800
Tag: v2.0.3
Merge branch 'MDL-25212' of git://github.com/epsd/moodle
commit af99e7286b569836443ef9410ee565fd095b11bf
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 14 Mar 2011 10:33:17 +0800
Tag: v2.0.3
Merge branch 'MDL-25939-3' of git://github.com/epsd/moodle
commit 77a5af1f1233f95b287eac7f8222c91c4f516a0e
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 14 Mar 2011 10:19:52 +0800
Tag: v2.0.3
Merge branch 'MDL-26084' of git://github.com/epsd/moodle
commit df94dbd825a4723ca3012109fd9e5bcd818fdf9d
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 14 Mar 2011 09:57:55 +0800
Tag: v2.0.3
Merge branch 'MDL-24743' of git://github.com/epsd/moodle
commit e2d50a6a007221b92bd6015522eee13174bc3ecc
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 14 Mar 2011 09:51:27 +0800
Tag: v2.0.3
Merge branch 'MDL-26711' of git://github.com/epsd/moodle
commit 0032523aeda6d73c6e938ec56488a86ae81351cd
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 07 Feb 2011 17:58:12 +0800
Tag: v2.0.2
Merge branch 'PULL-226-workshop' of git://github.com/mudrd8mz/moodle
commit 6ae16d7fff6fe24dd67005997482bc2e11cc7971
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 07 Feb 2011 16:31:38 +0800
Tag: v2.0.2
Merge branch 'w06_MDL-26262_20_onlineblock' of git://github.com/skodak/moodle
commit 9cb70adc338cebca2e7fcd7c2a7223182c9eedc9
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 07 Feb 2011 16:20:02 +0800
Tag: v2.0.2
Merge branch 'w06_MDL-26238_20_group' of git://github.com/skodak/moodle
commit 9377348eb0624f4719b672eec6cc7fa86764ae57
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 07 Feb 2011 16:11:50 +0800
Tag: v2.0.2
Merge branch 'w06_MDL-26221_20_courserole' of git://github.com/skodak/moodle
commit dedda4abc3135590dda81225fa32ce408a3838e2
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 07 Feb 2011 16:03:27 +0800
Tag: v2.0.2
Merge branch 'MDL-26272' of git://github.com/stronk7/moodle
commit c1a974983a06310f257b66ed99ad202cb24a7f81
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 07 Feb 2011 15:41:26 +0800
Tag: v2.0.2
Merge branch 'MDL-26245-typo_in_exception_string' of git://github.com/mudrd8mz/moodle
commit 82bbf32d3cd00d044098ae477ac6a479b5f24018
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 07 Feb 2011 15:32:23 +0800
Tag: v2.0.2
Merge branch 'MDL-26252-import-groups-help' of git://github.com/mudrd8mz/moodle
commit d44327efd9864497641f2597a87553f17f4961c8
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 07 Feb 2011 15:16:40 +0800
Tag: v2.0.2
Merge branch 'MDL-26119_message_logging' of git://github.com/andyjdavis/moodle
commit 89652edd6ce7ae5307c32eeffd453f6943e2ac38
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 07 Feb 2011 15:13:53 +0800
Tag: v2.0.2
Merge branch 'MDL-26242' of git://github.com/timhunt/moodle
commit 449adacbc3b0ebc99e62c5ad7d70168f787f02e4
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 07 Feb 2011 14:21:24 +0800
Tag: v2.0.2
Merge branch 'MDL-25639' of git://git.luns.net.uk/moodle
commit 1ca95a13f3ea4ea1cfcc73caf5202ff3b05b8a2c
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 07 Feb 2011 14:01:00 +0800
Tag: v2.0.2
Merge branch 'MDL-25874' of git://git.luns.net.uk/moodle
commit e8d6d2472978bab564831a6ca62e480432648742
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 07 Feb 2011 13:50:36 +0800
Tag: v2.0.2
Merge branch 'm20_MDL-25671_data_template_editor' of git://github.com/dongsheng/moodle
commit ed4801f4f0ee0d59dd84cd3e18636686a6b300e7
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 07 Feb 2011 13:40:51 +0800
Tag: v2.0.2
Merge branch 'MDL-25939'
commit 2b1f6ced64216b30489aa4e898583f93a39e3061
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 31 Jan 2011 17:47:30 +0800
Tag: v2.0.2
Merge branch 'MDL-26178' of git://github.com/timhunt/moodle
commit 1f5a33439eb7d0aef2e1cfe75d2512fa7a430a95
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 31 Jan 2011 17:16:56 +0800
Tag: v2.0.2
Merge branch 'm20_MDL-26176_cleanup' of github.com:danmarsden/moodle
commit dfc05681f2bcfb7b9d94ea2ebfc901716236b424
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 31 Jan 2011 17:06:53 +0800
Tag: v2.0.2
Merge branch 'm20_MDL-25781_TOC_fix' of git://github.com/danmarsden/moodle
commit d44d6448db1c98bb67d5ad4b9a5d08b61a5d8889
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 31 Jan 2011 16:28:28 +0800
Tag: v2.0.2
Merge branch 'w05_MDL-26069_20_filecheck' of git://github.com/skodak/moodle
commit cf59f747d0c08f5da763ae0d4d7d9fa3d5000384
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 31 Jan 2011 14:58:08 +0800
Tag: v2.0.2
Merge branch 'MDL-25913'
commit 0c6ab77c58c17b7f092a05ef4fa04ea16b600156
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 31 Jan 2011 14:41:04 +0800
Tag: v2.0.2
Merge branch 'MDL-25914'
commit 1c4b7783761409a7f1ace7fdd54fbe03f99e62c0
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 31 Jan 2011 14:16:46 +0800
Tag: v2.0.2
Merge branch 'MDL-25892' of git://github.com/epsd/moodle
commit 16ce82a4d3b7f1020abe07a0928145e61f3470a6
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 31 Jan 2011 14:10:12 +0800
Tag: v2.0.2
Merge branch 'MDL-25834'
commit 3721781dfed869a53d3625f4e0fbda0a2f106ef9
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 31 Jan 2011 13:50:21 +0800
Tag: v2.0.2
Merge branch 'MDL-26168' of git://github.com/timhunt/moodle
commit 60177f84a82337419c1e7ce11c6069b772331dba
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 31 Jan 2011 13:31:40 +0800
Tag: v2.0.2
Merge branch 'MDL-25786' of git://github.com/epsd/moodle
commit 13b9fe035c62fd772212c2aa5477b96948961662
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 31 Jan 2011 13:17:26 +0800
Tag: v2.0.2
Merge branch 'MDL-25723' of git://github.com/epsd/moodle
commit 8dadee2499aa22579508dd4b821948ce552625de
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 31 Jan 2011 13:05:09 +0800
Tag: v2.0.2
Merge branch 'MDL-21250-capitalized_strings' of git://github.com/mudrd8mz/moodle
commit 299a3e70813f5a520e3339ca767bd06a5ea8636f
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 31 Jan 2011 12:09:53 +0800
Tag: v2.0.2
Merge branch 'MDL-26158'
commit 3e6d0ac62804931660323ea8e855f09f3ba3e43d
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 31 Jan 2011 11:52:40 +0800
Tag: v2.0.2
Merge branch 'w05_MDL-25743_20_selfenrol' of git://github.com/skodak/moodle
commit ac36bda238c688125b2968828137d23aed495abc
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 25 Jan 2011 12:18:05 +0800
Tag: v2.0.2
PULL-157, MDL-26116 Fixed merge conflicts
commit 912d099cc94e40777b73b2412d12ffd95f79856d
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 24 Jan 2011 16:20:51 +0800
Tag: v2.0.2
Merge branch 'MDL-25637'
commit c9b2e8bf61331c08b94c14d5c99e349c49c03b2d
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 24 Jan 2011 15:05:55 +0800
Tag: v2.0.2
Merge branch 'w04_MDL-26035_20_installtest' of git://github.com/skodak/moodle
commit c053c86c5b1ac6f6839d9fe9b93b79d273080767
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 24 Jan 2011 13:26:51 +0800
Tag: v2.0.2
Merge branch 'w04_MDL-26066_20_dbenrol' of git://github.com/skodak/moodle
commit b6c7558c2d38d73238bfd9d70a0cc149c51c43d9
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 24 Jan 2011 11:57:06 +0800
Tag: v2.0.2
Merge branch 'w04_MDL-26096_20_catenrol' of git://github.com/skodak/moodle
commit 0243d7eb2f0cbef8a916acdf4d390b5b91de65a0
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 24 Jan 2011 11:51:38 +0800
Tag: v2.0.2
Merge branch 'w04_MDL-25855_20_filerequire' of git://github.com/skodak/moodle
commit 2e725dd72be130d494e539729c5c5c66c8cfb518
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 24 Jan 2011 11:38:29 +0800
Tag: v2.0.2
Merge branch 'MDL-26061-no_remote_users' of git://github.com/mudrd8mz/moodle.git with changes
commit c7a8c3623371e91d37a6cd955927d7dda31ed523
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 24 Jan 2011 11:10:40 +0800
Tag: v2.0.2
Merge branch 'w04_MDL-26008_20_creator' of git://github.com/skodak/moodle
commit 12cd15aeaa608bb00829c8d47c7822181ec1e670
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 24 Jan 2011 11:07:29 +0800
Tag: v2.0.2
Merge branch 'w04_MDL-26106_20_lebletypo' of git://github.com/skodak/moodle
commit 4fd25ab95cfbf68c6d6586a13e3f18ce4222780c
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 24 Jan 2011 11:02:07 +0800
Tag: v2.0.2
Merge branch 'm20_MDL-26063_SCORM_grouping' of git://github.com/danmarsden/moodle
commit 88c3ba8c06616696e104b188360ebe901d7e69b9
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 24 Jan 2011 11:00:27 +0800
Tag: v2.0.2
Merge branch 'w04_MDL-26041_20_resources' of git://github.com/skodak/moodle
commit f8b214e1cde48ae1d02798a9ab387981ee0a2158
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 24 Jan 2011 10:45:46 +0800
Tag: v2.0.2
Merge branch 'w04_MDL-26045_20_onlineblock' of git://github.com/skodak/moodle
commit e53a87dcb59247df40c92f7a9a36ca0c34400576
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 24 Jan 2011 10:31:34 +0800
Tag: v2.0.2
Merge branch 'MDL-25841' of git://github.com/timhunt/moodle
commit ab8bc2ee1cbbd29de2645cb91b3773ce54afa424
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 24 Jan 2011 10:20:22 +0800
Tag: v2.0.2
Merge branch 'MDL-25884' of git://github.com/timhunt/moodle
commit 34b681701ae15caf3296aa1a7bde38d7b26fa907
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 24 Jan 2011 10:08:32 +0800
Tag: v2.0.2
Merge branch 'MDL-26059' of git://github.com/timhunt/moodle
commit 69f9e678a336a073b862bef34516303420c1ea9c
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 18 Jan 2011 17:41:23 +0800
Tag: v2.0.2
Merge branch 'MDL-25988_20_wip_enrolroles' of git://github.com/skodak/moodle
commit 13738840b2a7ee39b0913116b43634087845d40f
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 18 Jan 2011 15:40:50 +0800
Tag: v2.0.2
Merge branch 'MDL-26031_20_wip_guestsession' of git://github.com/skodak/moodle
commit 07d4c7ac6e1305a3a2e975d1402c2da71e2f0d89
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 18 Jan 2011 15:34:43 +0800
Tag: v2.0.2
Merge branch 'MDL-26007_20_wip_enverror' of git://github.com/skodak/moodle
commit dcad74e406c4f6bd89159252a004ea40a464dda1
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 18 Jan 2011 14:18:24 +0800
Tag: v2.0.2
Merge branch 'MDL-25910_20_wip_mysqlsocket' of git://github.com/skodak/moodle
commit e5654cad1e10d34073e5b06be2f4494846c7779e
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 18 Jan 2011 13:47:31 +0800
Tag: v2.0.2
Merge branch 'MDL-25754_20_wip' of git://github.com/skodak/moodle
commit ec9b044d12e8b5e508a951c40c52be09d22e2bf9
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 18 Jan 2011 12:03:11 +0800
Tag: v2.0.2
Merge rebased branch 'MDL-25769' of git://github.com/andyjdavis/moodle.git
commit 3d12d1682ea7adb33446db6ae0eaa782e962b77b
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 18 Jan 2011 10:56:51 +0800
Tag: v2.0.2
Merge branch 'MDL-25887' of git://github.com/andyjdavis/moodle.git
commit 9498654c1d6feba14bbac91de2900d3382995173
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 17 Jan 2011 16:00:20 +0800
Tag: v2.0.2
Merge branch 'MDL-17884_m20' of git://github.com/rwijaya/moodle
commit fe1f367a115e90f805ff537132ae912b0fdc3b62
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 17 Jan 2011 15:54:27 +0800
Tag: v2.0.2
Merge branch 'MDL-25729_m20' of git://github.com/rwijaya/moodle
commit ca08b132e37477c7901aacff2c11cdef02324e33
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 17 Jan 2011 15:36:10 +0800
Tag: v2.0.2
Merge branch 'MDL-25860_20_wip_grpblocks' of git://github.com/skodak/moodle
commit 83be8fce3a5849f37ce90600d291d02ee97f7754
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 17 Jan 2011 15:24:01 +0800
Tag: v2.0.2
Merge branch 'MDL-25973_20_wip_charset' of git://github.com/skodak/moodle
commit c4592a2ac030bc25f16f70c3d67f4e11a1f909f5
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 17 Jan 2011 15:12:18 +0800
Tag: v2.0.2
Merge branch 'MDL-25971' of git://github.com/timhunt/moodle
commit 616e81cee92e27d4871c706bcf7de21c327a2a4a
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 17 Jan 2011 13:17:04 +0800
Tag: v2.0.2
Merge branch 'MDL-25962_20_wip_removeyui' of git://github.com/skodak/moodle
commit 242c4319ab9f4640f58f9f7caee9748c6a6043b8
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 17 Jan 2011 13:08:33 +0800
Tag: v2.0.2
Merge branch 'MDL-25936_wip' of git://github.com/skodak/moodle
commit bec662a0f603aceb43682874a51edd05c9600930
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 17 Jan 2011 11:35:06 +0800
Tag: v2.0.2
Merge branch 'MDL-25837_wip' of git://github.com/skodak/moodle
commit 227d6da5d870895beadc70a52a19dd7969ef8982
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 17 Jan 2011 10:53:24 +0800
Tag: v2.0.2
Merge branch 'MDL-25907_wip'
commit 0f1363069191ca2e7527067110a2d5712515e671
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 17 Jan 2011 10:17:40 +0800
Tag: v2.0.2
Merge branch 'MDL-25836_wip' of git://github.com/skodak/moodle
commit c5ea8d0bcc65b8aef879232b370b89b96e186991
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 17 Jan 2011 09:35:34 +0800
Tag: v2.0.2
Merge branch 'MDL-25935-user_picture_fields' of git://github.com/mudrd8mz/moodle
commit 4b3c86b1528ec145fad9925be2add2288debdd5f
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 10 Jan 2011 16:40:30 +0800
Tag: v2.0.2
Merge branch 'MDL-24133' of git://git.luns.net.uk/moodle
commit 5539372b2742c694f8c03254328f1b6494cd3108
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 10 Jan 2011 16:36:49 +0800
Tag: v2.0.2
Merge branch 'MDL-25909' of git://git.luns.net.uk/moodle
commit 0017173f1ad98c25780408e5022ac7dc92cf380b
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 10 Jan 2011 16:26:17 +0800
Tag: v2.0.2
Merge branch 'MDL-23393' of git://git.luns.net.uk/moodle
commit 1cc0c36e0417a05fab99d887c5b90a77c54bd57f
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 10 Jan 2011 16:12:50 +0800
Tag: v2.0.2
Merge branch 'MDL-23425' of git://git.luns.net.uk/moodle
commit 03364f9e2f3eb5c0b5336c82adde5b9d1acc8d15
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 10 Jan 2011 16:10:46 +0800
Tag: v2.0.2
Merge branch 'MDL-25869' of git://git.luns.net.uk/moodle
commit 726bc5250482389360700ce0d7c915a8a601eee1
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 10 Jan 2011 16:01:08 +0800
Tag: v2.0.2
Merge remote branch 'mouneyrac/MDL-25768'
commit 6b9240c55e059f7f1fa121186f5f068b6a47032c
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 10 Jan 2011 13:39:44 +0800
Tag: v2.0.2
Merge branch 'MDL-23657' of git://git.luns.net.uk/moodle
commit 9e41043ca432b859d64234d4392db8cfdfe7176c
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 10 Jan 2011 13:33:48 +0800
Tag: v2.0.2
Merge branch 'MDL-23224' of git://github.com/mouneyrac/moodle
commit 1861a2875a7d1502a24d5aea36b6f22dc1d454ba
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 10 Jan 2011 13:10:33 +0800
Tag: v2.0.2
Merge branch 'MDL-24299' of git://git.luns.net.uk/moodle
commit 34e54bbb623e5f91769a22e61baa8b3ecfb8b7a8
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 10 Jan 2011 13:02:52 +0800
Tag: v2.0.2
Merge branch 'MDL-25478' of git://git.luns.net.uk/moodle
commit 0d2d7a6553a7388c50047ef58b9d351779219e47
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 10 Jan 2011 12:08:10 +0800
Tag: v2.0.2
Merge branch 'MDL-25709-2' of git://git.luns.net.uk/moodle
commit dfcf4e081986df3be202e850f1bde8644bd20ba9
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 04 Jan 2011 13:47:55 +0800
Tag: v2.0.2
Merge branch 'MDL-25525' of git://git.luns.net.uk/moodle
commit 724125bdd437fc0166e131372bc1b738e06f0502
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 04 Jan 2011 13:30:32 +0800
Tag: v2.0.2
Merge branch 'MDL-25657' of git://git.luns.net.uk/moodle