Git merges in Moodle 2.1.7 by Eloy Lafuente (stronk7)
commit 97f5b526e6d5e486d7fdc618799f74b5a92c2fe1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Thu, 05 Jul 2012 09:41:51 +0800
Tag: v2.1.7
Merge branch 'MDL-34145_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commit 8162a1308a6665fdaaaa83abd356258915406c98
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 03 Jul 2012 05:54:02 +0800
Tag: v2.1.7
Merge branch 'MDL-23813_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commit 18df418a50ae116f8749de2bb509f439bab421a1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 02 Jul 2012 06:45:26 +0800
Tag: v2.1.7
Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE
commit 555769489a8de49d776ed8e45b05ab59f3a14817
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Sun, 01 Jul 2012 08:15:41 +0800
Tag: v2.1.7
Merge branch 'MDL-32249c-21' of github.com:srynot4sale/moodle into MOODLE_21_STABLE
commit bce307ee772f69a2a1c0f9ed785564128b5c6e71
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 25 Jun 2012 07:23:07 +0800
Tag: v2.1.7
Merge branch 'w25_MDL-33733_m21_unzipstorage' of git://github.com/skodak/moodle into MOODLE_21_STABLE
commit d332e9f0127532b15ddde6766aa99bd57c04a5e6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 25 Jun 2012 00:29:11 +0800
Tag: v2.1.7
Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE
commit 50c5d7ae6ddc430f73a0b4e928b1b56e66e69730
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Wed, 13 Jun 2012 06:57:26 +0800
Tag: v2.1.7
Merge branch 'MDL-33682_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commit e9637ea9ced8aff9539d4aae15e3a7f030bd21ec
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Wed, 13 Jun 2012 06:07:23 +0800
Tag: v2.1.7
Merge branch 'MDL-33681_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commit 417f9d311bc92f5af7a2142b54a9f2f23f09245a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 12 Jun 2012 16:07:15 +0800
Tag: v2.1.7
Merge branch 'w24_MDL-33670_m21_ofadmin' of git://github.com/skodak/moodle into MOODLE_21_STABLE
commit 5fbd62c25488cacecddb5112fb315492f80a05d2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 12 Jun 2012 08:55:35 +0800
Tag: v2.1.7
Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE
commit 34025ea1c2ecdbd98b9c997f9c975a9d3de91dd5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Fri, 08 Jun 2012 07:57:04 +0800
Tag: v2.1.7
Merge branch 'w23_MDL-33583_m21_keepall' of git://github.com/skodak/moodle into MOODLE_21_STABLE
commit 9987a9e0792474f1bd47d04bdb6803f9795fc9a1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Fri, 08 Jun 2012 06:05:24 +0800
Tag: v2.1.7
Merge branch 'MDL-32985_integration_21' of git://github.com/merrill-oakland/moodle into MOODLE_21_STABLE
commit 1f0856d6bfb5e112d057a74c06028826896fec63
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 05 Jun 2012 08:23:55 +0800
Tag: v2.1.7
Merge branch 'MDL-32649_ratings_sort_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE
commit 335a24ea72f143c3eae3f8e023e272a4d19f407f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 05 Jun 2012 08:03:06 +0800
Tag: v2.1.7
Merge branch 'MDL-32985_m21' of git://github.com/merrill-oakland/moodle into MOODLE_21_STABLE
commit 4a7f742d2ef3db80e1cdaec6d1c84b1d77350388
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Fri, 01 Jun 2012 15:43:36 +0800
Tag: v2.1.7
Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE
commit c1ca7fdcccbf5246f8b96c51e182ec562b13dd55
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Fri, 25 May 2012 18:45:01 +0800
Tag: v2.1.7
Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE
commit b571be75c54bf64afed95b5f54224bce62a37f9a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Sat, 19 May 2012 18:17:43 +0800
Tag: v2.1.7
Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE