Git merges in Moodle 2.0.6 by Sam Hemelryk

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