Git merges in Moodle 2.0.4 by Petr Skoda

commit aa79f99d5315fcb6d2de7f79b0c45c7d9aa2f408
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 26 Jul 2011 17:07:40 +0800
Tag:    v2.0.4

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

commit 2a41529f682dfbd0a6b17b1d029d86c44d6b5083
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 26 Jul 2011 01:55:46 +0800
Tag:    v2.0.4

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

commit e9adc8f6eba536e8dd0ffa0d618268220eaa68d4
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 25 Jul 2011 22:30:52 +0800
Tag:    v2.0.4

Merge branch 'MDL-28453_MOODLE_20_STABLE' into MOODLE_20_STABLE

commit e9889abe3889cc17e10db6c3624446a10047fa0e
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 19 Jul 2011 21:18:09 +0800
Tag:    v2.0.4

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

commit d96d9644257f4da6ebd1dbe10f3b629d058b5a28
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 21:34:42 +0800
Tag:    v2.0.4

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

commit 4f76e7ddf714f6ae5729a6e21c94a6ebe478821f
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 21:29:19 +0800
Tag:    v2.0.4

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

commit 393d636e259f92040d8d8f3102534aa0da69e545
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 21:25:56 +0800
Tag:    v2.0.4

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

commit 2b98c3d5e085d0a339835d81612a8749e4133e84
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 21:23:21 +0800
Tag:    v2.0.4

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

commit 2bd3fc4d0378e56c2722da060cd636bbf6e602ce
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 21:20:26 +0800
Tag:    v2.0.4

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

commit 6b43f50c41cb5ffa67f3249e9bb36c35275b2cef
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 21:18:24 +0800
Tag:    v2.0.4

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

commit 533a766447645844391772c0a1be6fa5507023ec
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 21:15:18 +0800
Tag:    v2.0.4

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

commit 59f3144e0abd2f0baddb4bd8f3f1c9c7fc0a19d3
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 20:58:38 +0800
Tag:    v2.0.4

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

commit 50296e134b96e28134a251313b33ff61c960e7a9
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 18 Jul 2011 15:36:20 +0800
Tag:    v2.0.4

Merge branch 'wip-MDL-25125-MOODLE_20_STABLE' of github.com:marinaglancy/moodle into MOODLE_20_STABLE