Git merges in Moodle 2.0.3 by Petr Skoda

commit b79ac7e0d6964d52a6f5b3b06e287569c3973c81
Author: Petr Skoda <commits@skodak.org>
Date:   Sun, 17 Apr 2011 23:16:48 +0800
Tag:    v2.0.3

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

commit 241ceba38ce66334e4e257d34f855eb6c78215fe
Author: Petr Skoda <commits@skodak.org>
Date:   Sun, 17 Apr 2011 23:09:59 +0800
Tag:    v2.0.3

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

commit 8e49e0833cd74fb6358699cfbc64fbe28a9e61f7
Author: Petr Skoda <commits@skodak.org>
Date:   Sun, 17 Apr 2011 23:04:09 +0800
Tag:    v2.0.3

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

commit f6bf9c932d26b509e36a3fee5e03976632a1e581
Author: Petr Skoda <commits@skodak.org>
Date:   Sun, 17 Apr 2011 22:40:10 +0800
Tag:    v2.0.3

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

commit 1fb2369b094c735958b57495126c2a530377f9c2
Author: Petr Skoda <commits@skodak.org>
Date:   Sun, 17 Apr 2011 22:22:34 +0800
Tag:    v2.0.3

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

commit 4de09258205a027b7af1bae23c6d743f9c10e214
Author: Petr Skoda <commits@skodak.org>
Date:   Sun, 17 Apr 2011 22:13:08 +0800
Tag:    v2.0.3

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

commit 85a91fb98e8e36bda09b38c4ba9df679890b5abd
Author: Petr Skoda <commits@skodak.org>
Date:   Wed, 13 Apr 2011 22:49:29 +0800
Tag:    v2.0.3

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

commit 6de6a45a1002084d1aee3281705c2eed8f4bc52d
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 12 Apr 2011 15:55:28 +0800
Tag:    v2.0.3

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

commit 16d610019a8bd92c47fd7cb5477a5bc9e0027772
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 11 Apr 2011 20:13:34 +0800
Tag:    v2.0.3

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

commit 4f5791da643e9be8573c9ad9dfa34131d03bdc6f
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 11 Apr 2011 20:10:38 +0800
Tag:    v2.0.3

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

commit 13ad1eaf37d2eb5cd43c5eebc81d4f68d50e3c98
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 11 Apr 2011 19:30:44 +0800
Tag:    v2.0.3

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

commit 42a50a0a454f7d8b02faa502b68321e3f3ccb8c5
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 05 Apr 2011 16:21:21 +0800
Tag:    v2.0.3

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

commit 27614a5e5d949f4433c7976f7446a755fd4d5a7b
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 04 Apr 2011 15:59:04 +0800
Tag:    v2.0.3

Merge branch 'wip-MDL-25651_MOODLE_20_STABLE' of git://github.com/jennymgray/moodle into MOODLE_20_STABLE

commit 4cb05cea9d506cda17660ae4a8dc48aa8acac63d
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 29 Mar 2011 16:00:04 +0800
Tag:    v2.0.3

Merge branch 'MDL-26964-moodle_url-anchor_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit 5c686792c63b1d8c2de1c999fd13e1e41ed513e2
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 28 Mar 2011 21:13:47 +0800
Tag:    v2.0.3

Merge branch 'MDL-26335' of github.com:mouneyrac/moodle into MOODLE_20_STABLE

commit c20d07074ced7339708c91ab87f4430c776c7612
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 22 Mar 2011 02:16:37 +0800
Tag:    v2.0.3

Merge branch 'MDL-23022' of git://github.com/samhemelryk/moodle

commit 3bfb75a9eda182274c52c055d5200081c7d9b5c3
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 22 Mar 2011 02:10:15 +0800
Tag:    v2.0.3

Merge branch 'wip-MDL-26781' of git://github.com/sammarshallou/moodle

commit 7b2dde5a802c3a50e03a6f2bd4af6c6167c8cdfb
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 22 Mar 2011 02:06:28 +0800
Tag:    v2.0.3

Merge branch 'wip-MDL-26747' of git://github.com/sammarshallou/moodle

commit 94ff0f08f397899ba5417e5218104ae5d720e67f
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 22 Mar 2011 02:02:16 +0800
Tag:    v2.0.3

Merge branch 'MDL-26922' of git://github.com/stronk7/moodle

commit 25bd4d9a375b83655b2d8c82f5f3d6780c321042
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 22 Mar 2011 01:10:35 +0800
Tag:    v2.0.3

Merge branch 'MDL-26847_amended' of git://github.com/timhunt/moodle

commit 2c23734a7ff62d8ee3e886699124e5f6b6c0d064
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 22 Mar 2011 01:02:46 +0800
Tag:    v2.0.3

Merge branch 'MDL-25975' of git://github.com/samhemelryk/moodle

commit 61baea5d22e42ef8518fd38e9eb6c02d6ed0a38f
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 22 Mar 2011 01:00:07 +0800
Tag:    v2.0.3

Merge branch 'MDL-26903' of git://github.com/samhemelryk/moodle

commit 10464ffb3339dec23c10d711944d8ca74f1e68eb
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 21 Mar 2011 22:39:31 +0800
Tag:    v2.0.3

Merge branch 'MDL-26887' of git://github.com/timhunt/moodle

commit dca072aedc73638ee436933262e7d0ee1f27119a
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 21 Mar 2011 21:52:11 +0800
Tag:    v2.0.3

Merge branch 'MDL-26571_lesson_scale' of git://github.com/andyjdavis/moodle

commit e5be555c27196f3c89325c3215ad40d09d2dbef9
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 21 Mar 2011 21:49:18 +0800
Tag:    v2.0.3

Merge branch 'MDL-26768_0_grade' of git://github.com/andyjdavis/moodle

commit 949fe7154ca8ac0dabfe1e7557547a987d8febde
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 21 Mar 2011 21:46:59 +0800
Tag:    v2.0.3

Merge branch 's8_MDL-26919_search_dialog_event' of git://github.com/dongsheng/moodle

commit d96b0a969b0ce3b1d0476ad392395137621ce94d
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 21 Mar 2011 21:03:33 +0800
Tag:    v2.0.3

Merge branch 'wip-MDL-26822'

commit b0b4ab1aff3224c27d9b23438b45b9821beff98a
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 15 Mar 2011 03:55:04 +0800
Tag:    v2.0.3

Merge branch 'MDL-26464_m20_v2' of github.com:skodak/moodle

commit cd3d2823af205acf1ad6d49161f5679e6db3af23
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 15 Mar 2011 01:21:33 +0800
Tag:    v2.0.3

Merge branch 'MDL-26228_grade_full_view2' of git://github.com/andyjdavis/moodle

commit 65361ab836b0fa62e9b3e9b5f62f2559157cce3a
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 15 Mar 2011 01:18:24 +0800
Tag:    v2.0.3

Merge branch 'MDL-24724_course_profile' of git://github.com/andyjdavis/moodle

commit 3908f7ca1af839b56391a353b5e6e28958645645
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 15 Mar 2011 01:01:19 +0800
Tag:    v2.0.3

Merge branch 'MDL-4633_m20' of git://github.com/rwijaya/moodle

commit 4eca364392d60850911add29a575d4bdada13a7f
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 07 Mar 2011 19:52:51 +0800
Tag:    v2.0.3

Merge branch 'MDL-26458_PULL' of git://github.com/nebgor/moodle

commit 8eade3d773c58dc62f7a549709be56ffd006c06f
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 07 Mar 2011 19:40:04 +0800
Tag:    v2.0.3

Merge branch 'MDL-26392_wiki_images' of git://github.com/dongsheng/moodle

commit 25ca24d59fb4a554b5299dc4e8939d277ddf4668
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 07 Mar 2011 19:32:46 +0800
Tag:    v2.0.3

Merge branch 'MDL-25388_restore_activities_target' of git://github.com/stronk7/moodle

commit 2c10c5f4e53e8c3fc1ebf0d1cfcef0d0bd2de5f9
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 07 Mar 2011 19:28:27 +0800
Tag:    v2.0.3

Merge branch 'wip-MDL-26423' of git://github.com/sammarshallou/moodle

commit 29c852088acb978d0a5e9c7f79762174932ff75d
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 07 Mar 2011 17:25:28 +0800
Tag:    v2.0.3

Merge branch 'wip-MDL-26625' of git://github.com/sammarshallou/moodle

commit 7a2f4c12b62e7809fa9a43bf87c2a008b628cd8d
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 07 Mar 2011 17:18:31 +0800
Tag:    v2.0.3

Merge branch 'MDL-26433_message_constants' of git://github.com/andyjdavis/moodle

commit 70e6628ea3ca68881e6674b0b8623e335bb95db0
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 28 Feb 2011 17:06:03 +0800
Tag:    v2.0.3

Merge branch 'MDL-26576' of git://github.com/timhunt/moodle

commit 589028b2037719f12fd544dcc5f75a063d352b6d
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 28 Feb 2011 17:03:57 +0800
Tag:    v2.0.3

Merge branch 'MDL-25760' of git://github.com/ptrkmkl/moodle

commit bca4fa81a86084f2522bc5f6e95ba3c24fdf04f6
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 28 Feb 2011 17:01:03 +0800
Tag:    v2.0.3

Merge branch 'MDL-26451_alfresco_repo' of git://github.com/dongsheng/moodle

commit ed9fd13fd626df87bacee6decdf5eca98bc6001a
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 28 Feb 2011 16:59:13 +0800
Tag:    v2.0.3

Merge branch 'MDL-26228_grade_full_view' of git://github.com/andyjdavis/moodle

commit 7c4c754a89d09908b51fb0e461fd4286c5d053cc
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 28 Feb 2011 16:56:36 +0800
Tag:    v2.0.3

Merge branch 'MDL-26442_qtype_match' of git://github.com/stronk7/moodle

commit 16fd74a3a5e44806e9c21572d4551e8f13218d65
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 28 Feb 2011 16:48:38 +0800
Tag:    v2.0.3

Merge branch 'm20_MDL-26545_userpicfix' of git://github.com/danmarsden/moodle