Git merges in Moodle 2.2.4 by Eloy Lafuente (stronk7)

commit 3021f92c8ce6eb72256217da1e349d6324f18b57
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 05 Jul 2012 09:41:38 +0800
Tag:    v2.2.4

Merge branch 'MDL-34145_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 54bf19763eef86ec5d14d4a3fa19e62e6aa9b851
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Jul 2012 22:09:22 +0800
Tag:    v2.2.4

Merge branch 'MDL-33426-m22' of git://github.com/sammarshallou/moodle into MOODLE_22_STABLE

commit dbaad889e83483e2f20fdafee339267f899b7e68
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Jul 2012 05:53:29 +0800
Tag:    v2.2.4

Merge branch 'MDL-23813_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit e2710cb374fc535484f2d0f7aa9ebcf574aa1db3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Jul 2012 00:21:04 +0800
Tag:    v2.2.4

Merge branch 'w27_MDL-34121_m22_killbackupmess' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 880b243c8d991e994844cbd96a6a20c3d4ae7444
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 02 Jul 2012 06:41:10 +0800
Tag:    v2.2.4

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit 260bbdbc0955042a990257207fac95c54dde3e51
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sun, 01 Jul 2012 08:15:19 +0800
Tag:    v2.2.4

Merge branch 'MDL-32249c-22' of github.com:srynot4sale/moodle into MOODLE_22_STABLE

commit 1257e3b7297bf5a321fc76da814e98d7b805ca19
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 25 Jun 2012 07:21:52 +0800
Tag:    v2.2.4

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

commit 84acd5d794a886b3c260a4fe261f327816d1e9ac
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 25 Jun 2012 00:28:55 +0800
Tag:    v2.2.4

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit 984109868d7a38177b2d9d07c54cf49bc029f8d6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Jun 2012 09:10:12 +0800
Tag:    v2.2.4

Merge branch 'MDL-33523_22' of git://github.com/dmiletic/moodle into MOODLE_22_STABLE

commit 0f63503db034ec01f437050d002a798a0fbd4332
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Jun 2012 06:56:22 +0800
Tag:    v2.2.4

Merge branch 'MDL-33682_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 897329c2473d330cc5809dacf23e6fe2ed70e331
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Jun 2012 06:06:41 +0800
Tag:    v2.2.4

Merge branch 'MDL-33681_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

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

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit 887e2c85359aa61b9c9ec9f353767972e9c40506
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 08 Jun 2012 07:56:31 +0800
Tag:    v2.2.4

Merge branch 'w23_MDL-33583_m22_keepall' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 746a8b2838a11f6826f456deda9eb583239a8e9a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 08 Jun 2012 06:05:01 +0800
Tag:    v2.2.4

Merge branch 'MDL-32985_integration_22' of git://github.com/merrill-oakland/moodle into MOODLE_22_STABLE

commit 55a83bd03474b953d32ed3299ac034f02badc020
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Jun 2012 08:23:30 +0800
Tag:    v2.2.4

Merge branch 'MDL-32649_ratings_sort_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 8b01dd9d0f30730d4ee4fc411d1d952ec1cb4a75
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Jun 2012 08:02:40 +0800
Tag:    v2.2.4

Merge branch 'MDL-32985_m22' of git://github.com/merrill-oakland/moodle into MOODLE_22_STABLE

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

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit 5606d3aa5c4a02e0b897226f6dd79cc3319d99dc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 25 May 2012 18:44:47 +0800
Tag:    v2.2.4

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit 2871fedb58a2f855708a9f484ea34790f54cd07a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 19 May 2012 18:17:27 +0800
Tag:    v2.2.4

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE