Git merges in Moodle 2.0.4 by Eloy Lafuente (stronk7)

commit a53760ef5ab238c11f75c3af01e418c0c65ee485
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jul 2011 22:31:40 +0800
Tag:    v2.0.4

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

commit 8c5b86e044c95402eb4efc8f9031066800ffc3c7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jul 2011 18:23:19 +0800
Tag:    v2.0.4

Merge branch 'MDL-28210_messaging_constants_20_2' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE

commit 96651cf9ed24d65a7228d779e21277ad8d5ee8b8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jul 2011 02:29:01 +0800
Tag:    v2.0.4

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

commit 583c465a3a9c3a7e0d2e9858b9fd3e77cb909ada
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jul 2011 01:48:54 +0800
Tag:    v2.0.4

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

commit 24f90eedb907e56e038d85c3b66edcd558b5bd62
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jul 2011 01:44:41 +0800
Tag:    v2.0.4

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

commit 0d81404f9a39f0998d4392137c77b6c6f0a3a14a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jul 2011 01:36:16 +0800
Tag:    v2.0.4

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

commit 15ffa46a1af64e96440497d7549bac044907c9cc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Jul 2011 22:27:04 +0800
Tag:    v2.0.4

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

commit 38bc3c281a345ec065a2017b8696b432a76af92f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Jul 2011 21:58:33 +0800
Tag:    v2.0.4

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

commit 6761018805b76c28ae09fd3713f9f91ecbfda1bc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 08 Jul 2011 07:19:22 +0800
Tag:    v2.0.4

Merge branch 'MDL-28015-workshop-sql_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit 9948122905100141db8fd5865ac641ddd3a96aea
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 08 Jul 2011 06:58:24 +0800
Tag:    v2.0.4

Merge branch 'MDL-28168-custommenu_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit c1979ef02d59a4673b222eda06ef64a74a85c6f4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Jul 2011 16:38:44 +0800
Tag:    v2.0.4

Merge branch 'fix_import_search_course' of git://github.com/hit-moodle/moodle into MOODLE_20_STABLE

commit e3171137463fca4f819a3fc7ca933ebe22ca9ce8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Jul 2011 09:02:26 +0800
Tag:    v2.0.4

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

commit fea115dab35235b076b9c9a080cba2eb0435e281
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Jul 2011 08:23:33 +0800
Tag:    v2.0.4

Merge branch 'MDL-27989_MOODLE_20_STABLE' of git://github.com/kordan/moodle into MOODLE_20_STABLE

commit 4bd293ee63f403f259b7b89a3176ee21ac98cc77
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Jul 2011 01:26:56 +0800
Tag:    v2.0.4

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

commit c18a7f9d9432a367bcfb142e327ef26e43614a4b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Jul 2011 23:58:25 +0800
Tag:    v2.0.4

Merge branch 'MDL-28185_m20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit 07ca3c68163a6d9b1df4dbe5b7fe472e2df8d4aa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Jul 2011 23:48:30 +0800
Tag:    v2.0.4

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

commit 087a329eefe5974de4717e1615a4f4ffab2101db
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 02 Jul 2011 05:37:36 +0800
Tag:    v2.0.4

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

commit 1dcb107bd441cf345fc913ac850d5d80bbbc2663
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 01 Jul 2011 07:38:44 +0800
Tag:    v2.0.4

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

commit f6c6bb4d39a582b5b51129c7ece0391f06ec178a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 23:12:31 +0800
Tag:    v2.0.4

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

commit add39c57dd21becd7c898e60534f6bd2424f96d4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 08:01:44 +0800
Tag:    v2.0.4

Merge branch 'MDL-28044_MOODLE_20_STABLE' of git://github.com/nebgor/moodle into MOODLE_20_STABLE

commit 1b024a0b51dfb62f5d5058bca24c265b14164f3e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 07:54:44 +0800
Tag:    v2.0.4

Merge branch 'MDL-15587-stable' of git://github.com/grabs/moodle into MOODLE_20_STABLE

commit 9d12edfcae25ca128a31f63fc4037f829ace30a6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 30 Jun 2011 07:11:28 +0800
Tag:    v2.0.4

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

commit 8277c39c763a5b6c988e2a5aeb6981b73c74978a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Jun 2011 21:59:57 +0800
Tag:    v2.0.4

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

commit fb654f651fc53ff9fb0f7184f18c7ee8bb4ae985
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Jun 2011 21:12:50 +0800
Tag:    v2.0.4

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

commit 7cb1a84978197b480bcbd735592758878bad8599
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Jun 2011 06:55:29 +0800
Tag:    v2.0.4

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

commit 4a8d589d411e61997916d41a57cfd58aa2ad18f1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 24 Jun 2011 06:23:03 +0800
Tag:    v2.0.4

Merge branch 'MDL-27827_stable' of git://github.com/grabs/moodle into MOODLE_20_STABLE

commit ffd06a7394657ba1c60850d4e97d9263238e0c67
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 24 Jun 2011 06:14:41 +0800
Tag:    v2.0.4

Merge branch 's11_MDL-27999_wiki_preview_20' of github.com:dongsheng/moodle into MOODLE_20_STABLE

commit ba55e33828b2bb6dca474266b760aa53334fb31f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 24 Jun 2011 05:58:21 +0800
Tag:    v2.0.4

Merge branch 'wip-MDL-27958-MOODLE_20_STABLE' of git://github.com/samhemelryk/moodle into MOODLE_20_STABLE

commit 4a225b69bb15153e9ec105474b9a9d487a10f988
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 17:24:19 +0800
Tag:    v2.0.4

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

commit 727242750d62802853b07fb2aa786b58f95eca02
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 17:16:34 +0800
Tag:    v2.0.4

Merge branch 's10_MDL-27341_flickr_plugin_20' of git://github.com/dongsheng/moodle into MOODLE_20_STABLE

commit 1bef145b49ff0bfa45dacc9819f2a21fc13c1f6e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 16:19:13 +0800
Tag:    v2.0.4

Merge branch 'MDL-27920_grade_export_20' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE

commit 177f14d6f6c6589b5adc56052a685c7fc95ae7b5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 08:05:45 +0800
Tag:    v2.0.4

Merge branch 's10_MDL-27341_flickr_plugin_20' of git://github.com/dongsheng/moodle into MOODLE_20_STABLE

commit bdcea1a221dacb9d7095dc216519155cf6aa2e61
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jun 2011 06:26:09 +0800
Tag:    v2.0.4

Merge branch 'MDL-27196-hardcodedstrings_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit 26a92149cc00c2d6c9118893411e48c914e1e068
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 20:28:36 +0800
Tag:    v2.0.4

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

commit 38961259dea1c732f3e65191c71e8b72a35b059d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 20:16:41 +0800
Tag:    v2.0.4

Merge branch 'MDL-27969-randomallocator-20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit 528cde2db247777c7da2ee54ea2064a6d9a12914
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 20:12:11 +0800
Tag:    v2.0.4

Merge branch 'MDL-27073_multilang-custommenu_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit 2c85a824fcf49ea688e7d188aa772827cd039fbd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 09:07:26 +0800
Tag:    v2.0.4

Merge branch 's10_MDL-27341_flickr_json_error_20' of git://github.com/dongsheng/moodle into MOODLE_20_STABLE

commit 6ce26b03e75cd2cb54f148a6969b2031c1752366
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 09:00:41 +0800
Tag:    v2.0.4

Merge branch 'MDL-27860_2.0' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit 5def8d573dda3cb4863a877894b70598a27b7eda
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Jun 2011 08:36:05 +0800
Tag:    v2.0.4

Merge branch 'MDL-26948_2.0' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit c06e87a41070bb77151a9f0e043fcf137bd4c9fc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 17 Jun 2011 01:04:49 +0800
Tag:    v2.0.4

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

commit db005da178c3fc9aab78822c7e76569770adaf89
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 16 Jun 2011 16:39:48 +0800
Tag:    v2.0.4

Merge branch 'MDL-24355-MOODLE_20_STABLE2' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE

commit a9e0bc82fb61b9c2198cde6d96ac7db4ec403e78
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jun 2011 17:30:15 +0800
Tag:    v2.0.4

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

commit b5e8919b7caceddb9f70a8f1f533e2f67ece5713
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jun 2011 07:18:33 +0800
Tag:    v2.0.4

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

commit 397262e292c63175bb62fe7ed33603689c31d202
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jun 2011 06:55:08 +0800
Tag:    v2.0.4

Merge branch 'MDL-27848_for_MOODLE_20_STABLE' of git://github.com/kordan/moodle into MOODLE_20_STABLE

commit 87c8b752cac92409dbb1cbdecdcc5f2a423b33da
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jun 2011 23:01:56 +0800
Tag:    v2.0.4

Merge branch 'wip-MDL-27759-MOODLE_20_STABLE' of git://github.com/rajeshtaneja/moodle into MOODLE_20_STABLE

commit 4fcc689dfcef9ef3691643e33f57f51888a03608
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jun 2011 18:30:55 +0800
Tag:    v2.0.4

Merge branch 'wip-MDL-27825-MOODLE_20_STABLE' of git://github.com/samhemelryk/moodle into MOODLE_20_STABLE

commit 27f31cc626a10dbeff3da0a8b90c31ce504b9dbc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jun 2011 18:12:57 +0800
Tag:    v2.0.4

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

commit c5b9fe0ddad8c1b3bcfcc037957ebcbeffc31c6d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 09 Jun 2011 09:38:54 +0800
Tag:    v2.0.4

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

commit 07511dbe6df6e1cd356d2bed976c99d8a8d6050b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 09 Jun 2011 07:23:30 +0800
Tag:    v2.0.4

Merge branch 'wip-MDL-27638-MOODLE_20_STABLE' of git://github.com/samhemelryk/moodle into MOODLE_20_STABLE

commit df70dfe4eebb06a6801b9676f60a4777f7c20402
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 09 Jun 2011 07:10:27 +0800
Tag:    v2.0.4

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

commit f872b32778abc6af36c0c285c9e91a362d02a975
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 09 Jun 2011 06:36:33 +0800
Tag:    v2.0.4

Merge branch 'wip-MDL-27676-MOODLE_20_STABLE' of git://github.com/samhemelryk/moodle into MOODLE_20_STABLE

commit 0a770d5c6c706b4c888a37072b19064c1fc68baf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 03 Jun 2011 05:28:02 +0800
Tag:    v2.0.4

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

commit b5e1c2e748008d39914b15a63d114d3cf5a74b79
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 31 May 2011 07:01:24 +0800
Tag:    v2.0.4

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

commit 4e184a9ce62e944c70be51ccd10ff64faf013cda
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 26 May 2011 06:14:02 +0800
Tag:    v2.0.4

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

commit 36420f78c1c7658c8d6c5c71cd2f166130b6fb12
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 May 2011 22:38:48 +0800
Tag:    v2.0.4

Merge branch 'MDL-27625_20stable' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit 19ab387d068106cd2ae5b9bd06d10ed078b1d928
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 May 2011 00:49:49 +0800
Tag:    v2.0.4

Merge branch 'wip-MDL-27192_MOODLE_20_STABLE' of git://github.com/jason-platts/moodle into MOODLE_20_STABLE

commit e56ac08a5cf73a19142bb4bd774f2951743fc4e6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 May 2011 20:28:55 +0800
Tag:    v2.0.4

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

commit e1ad9ae4f5fe3ddf39d66d7f5c0c7ff989604fd4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 May 2011 18:00:10 +0800
Tag:    v2.0.4

Merge branch 'MDL-26704_user_outline_report' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE

commit 890c7fae4ef305275afc63e2df7cc4e48f1be6f9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 16 May 2011 15:26:29 +0800
Tag:    v2.0.4

Merge branch 'MDL-26436_close_recordsets3' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE

commit 9ae0b69f59829c6d91c5b06563185cdab74a3c2e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 16 May 2011 08:46:52 +0800
Tag:    v2.0.4

Merge branch 'MDL-26436_close_recordsets2' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE

commit 2430319b523b60031647a2d5596a8eb26ffa1c3d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 09 May 2011 23:47:47 +0800
Tag:    v2.0.4

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

commit 30dc7311adf2cb0380229190a8afee923bc4b076
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 09 May 2011 08:13:26 +0800
Tag:    v2.0.4

Merge branch 'wip-MDL-27400-MOODLE_20_STABLE' of git://github.com/samhemelryk/moodle into MOODLE_20_STABLE

commit 9784520acba47cda3b1744c1e016667880dc5efb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 09 May 2011 07:55:39 +0800
Tag:    v2.0.4

Merge branch 'MDL-27372_MOODLE_20_STABLE' of git://github.com/nebgor/moodle into MOODLE_20_STABLE

commit d015c2352ffcdb8439b93e2cb4d2fd2b46c4df21
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 09 May 2011 07:01:44 +0800
Tag:    v2.0.4

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