Git merges in Moodle 2.0.1 by Eloy Lafuente (stronk7)

commit 2b8387bd1eb2415884e06a6d440299dcfef5836c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 25 Jun 2012 07:30:29 +0800
Tag:    v2.0.10

Merge branch 'w25_MDL-33733_m20_unzipstorage' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit b506964761e744b29f61a60542b89df4a795b6a5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 25 Jun 2012 00:29:30 +0800
Tag:    v2.0.10

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

commit b9043a5d7b8112502a2f7f3774553c53dbe9408e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jun 2012 08:55:52 +0800
Tag:    v2.0.10

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

commit f1cdf71eb62857c411a17b81b57d04aaa4a287fa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 01 Jun 2012 15:43:54 +0800
Tag:    v2.0.10

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

commit 5356317a41b0d710a8cdb475179d7ac382096d27
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 19 May 2012 18:17:59 +0800
Tag:    v2.0.10

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

commit 958c04e450295f164990b5b9eda000e4fa358e3f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Dec 2010 00:02:02 +0800
Tag:    v2.0.1

Merge branch 'master' of git.moodle.org:/git/integration

commit 011c956ba14ab69d20d404e13a36c5608ea7b250
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Dec 2010 19:21:21 +0800
Tag:    v2.0.1

Merge branch 'm20_MDL-14934_excel_time' of github.com:dongsheng/moodle