Git merges in Moodle 2.0.6 by Eloy Lafuente (stronk7)

commit 4ad8c6e350295675afabec674fb21a2e812460b4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 28 Nov 2011 06:39:44 +0800
Tag:    v2.0.6

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit e16d680905cabe5cac12e020f4d2abb88688ec03
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 28 Nov 2011 06:18:39 +0800
Tag:    v2.0.6

Merge branch 'dropbox-api-bump-for-20_STABLE' of git://git.luns.net.uk/moodle into MOODLE_20_STABLE

commit 0c8697540c8fe955d8c94f903157c9f7580c5ebc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 25 Nov 2011 18:04:58 +0800
Tag:    v2.0.6

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 2a71a2648ee528b2fe6ceaa65555308e9fcd5e55
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 20:29:03 +0800
Tag:    v2.0.6

Merge branch 'wip-mdl-30375-m20' of git://github.com/rajeshtaneja/moodle into MOODLE_20_STABLE

commit 25641ce2da43ad79a14271e8d1bae26f83e2c53e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 18:49:17 +0800
Tag:    v2.0.6

Merge branch 'MDL-29060_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit 8a2ac4cb74e9f2724cec6f02e61d008a127d4a3f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 18:38:32 +0800
Tag:    v2.0.6

Merge branch 'wip-mdl-28947-m20' of git://github.com/rajeshtaneja/moodle into MOODLE_20_STABLE

commit ec4b3cbcae1f63207bfc8410b6e2990056bb82cc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 10:07:45 +0800
Tag:    v2.0.6

Merge branch 'MDL-30042-MOODLE_20_STABLE-1' of git://git.luns.net.uk/moodle into MOODLE_20_STABLE

commit d112ae914f8acb41958b00518c36f28bdeb2642e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 10:02:40 +0800
Tag:    v2.0.6

Merge branch 'MDL-27045_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit 731e021f9ccabd0b6c80a7a295a6f93175521968
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 08:08:17 +0800
Tag:    v2.0.6

Merge branch 'MDL-30402-install-string_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit da7ab3476254725fb722da10eb3fa5c918b8a243
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 18 Nov 2011 03:18:38 +0800
Tag:    v2.0.6

Merge branch 'MDL-29350-MOODLE_20_STABLE-2' of git://git.luns.net.uk/moodle into MOODLE_20_STABLE

commit 991ee3344ad602f45f7238e5b5f86bfafe69255c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Nov 2011 08:23:08 +0800
Tag:    v2.0.6

Merge branch 'MDL-29743_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit 9fdd6c8bc886d1bbae0f97e11e96514a8e85cf91
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 15 Nov 2011 17:55:39 +0800
Tag:    v2.0.6

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit c8a5dfe0bdb2d380f171f1a074cb434ec75737db
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 Nov 2011 09:44:00 +0800
Tag:    v2.0.6

Merge branch 'MDL-29035-m20' of git://github.com/ankitagarwal/moodle into MOODLE_20_STABLE

commit 1739fe7331654efe40264958cb8a930b3a9580a9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 Nov 2011 09:34:32 +0800
Tag:    v2.0.6

Merge branch 'MDL-22351-M20' of git://github.com/lazydaisy/moodle into MOODLE_20_STABLE

commit 3d99c7ef9924c3b171f41fcfaa2e43ebc28d6fda
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 10 Nov 2011 08:34:05 +0800
Tag:    v2.0.6

Merge branch 'MDL-28426_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit 81a95b0185c07959f64c3e9bd2f69395dc3dc8b1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 10 Nov 2011 07:23:02 +0800
Tag:    v2.0.6

Merge branch 'MDL-30158-m20' of git://github.com/ankitagarwal/moodle into MOODLE_20_STABLE

commit 6733ba320d33cb065cbb70846d8227a2e494b0ba
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Nov 2011 22:57:09 +0800
Tag:    v2.0.6

Merge branch 'MDL-27542b_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE

commit 8a79a37526ed27e9cee5b3c72a043df23eb2ae34
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 03 Nov 2011 02:48:57 +0800
Tag:    v2.0.6

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 3db86da7bb531ae1bcbe416c60ee14a842d0036e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Nov 2011 02:55:52 +0800
Tag:    v2.0.6

Merge branch 'm20_MDL-29213' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE

commit 46fe9a9701b1fe16e0e0994cb090864973574ee6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 28 Oct 2011 00:49:26 +0800
Tag:    v2.0.6

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 9bec13184c3a024c8aabaa6789a7f01a913f4a68
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Oct 2011 05:15:04 +0800
Tag:    v2.0.6

Merge branch 'w42_MDL-29867_m20_author' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 87187e0ef9d9895948fc192229eaf288fdea6e92
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 20 Oct 2011 00:41:53 +0800
Tag:    v2.0.6

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 2092307abaece68f7394fc97f1b36fe12c45a4ea
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Oct 2011 17:02:30 +0800
Tag:    v2.0.6

Merge branch 'wip-MDL-29496-stable20' of git://github.com/phalacee/moodle into MOODLE_20_STABLE

commit 3065bfa1e1d181ff4255c855c3290ca62f2070e7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sun, 16 Oct 2011 23:38:37 +0800
Tag:    v2.0.6

Merge branch 'MDL-28483-m20' of git://github.com/ankitagarwal/moodle into MOODLE_20_STABLE