Git merges in Moodle 2.6.4 by Damyon Wiese
commit 62a1434588155a3fc2feda4609c5407506c07eae
Author: Damyon Wiese <damyon@moodle.com>
Date: Thu, 10 Jul 2014 10:00:03 +0800
Tag: v2.6.4
Merge branch 'MDL-19270_moodle26stable' of https://github.com/nadavkav/moodle into MOODLE_26_STABLE
commit 47042403caaf004391f03547fd51f970a9c35852
Author: Damyon Wiese <damyon@moodle.com>
Date: Tue, 24 Jun 2014 17:00:17 +0800
Tag: v2.6.4
Merge branch 'MDL-45652_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE
commit fc463d34e80fcf5f0644e9c265056700d76d23a8
Author: Damyon Wiese <damyon@moodle.com>
Date: Tue, 24 Jun 2014 16:04:28 +0800
Tag: v2.6.4
Merge branch 'MDL-10115-26' of git://github.com/xow/moodle into MOODLE_26_STABLE
commit b1e4d8b119e89927f14e5d9aac10c0e08381d894
Author: Damyon Wiese <damyon@moodle.com>
Date: Tue, 24 Jun 2014 13:08:52 +0800
Tag: v2.6.4
Merge branch 'MDL-46035_survey_26' of https://github.com/andyjdavis/moodle into MOODLE_26_STABLE
commit 80fa42a0015af5d5815d3978340f1b8882c4bd7f
Author: Damyon Wiese <damyon@moodle.com>
Date: Tue, 24 Jun 2014 11:31:54 +0800
Tag: v2.6.4
Merge branch 'MDL-46076-m26' of https://github.com/sammarshallou/moodle into MOODLE_26_STABLE
commit 63de1463f8c06bf0b6553e4bee47724b9e422c2a
Author: Damyon Wiese <damyon@moodle.com>
Date: Tue, 24 Jun 2014 10:58:47 +0800
Tag: v2.6.4
Merge branch 'MDL-44512-26' of git://github.com/jethac/moodle into MOODLE_26_STABLE
commit 1b25b037dc11f48a3b01317f00da1f51a7770935
Author: Damyon Wiese <damyon@moodle.com>
Date: Mon, 23 Jun 2014 15:20:40 +0800
Tag: v2.6.4
Merge branch 'MDL-45580-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
commit 3f3ecc0311302b133ca2535a8827c403fba2d2f3
Author: Damyon Wiese <damyon@moodle.com>
Date: Mon, 23 Jun 2014 14:40:33 +0800
Tag: v2.6.4
Merge branch '37145-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE
commit 20ab72d496379451e84747b8f4b94d1e89d7e35c
Author: Damyon Wiese <damyon@moodle.com>
Date: Mon, 23 Jun 2014 13:54:59 +0800
Tag: v2.6.4
Merge branch 'MDL-38693-26' of git://github.com/jethac/moodle into MOODLE_26_STABLE
commit d61f480fb6d398d500d40ff3b38e6aa29e328f08
Author: Damyon Wiese <damyon@moodle.com>
Date: Mon, 23 Jun 2014 12:30:18 +0800
Tag: v2.6.4
Merge branch 'MDL-35453_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE
commit 13f327b533bfd38c05ae6b0d46060643e6ae6983
Author: Damyon Wiese <damyon@moodle.com>
Date: Thu, 19 Jun 2014 14:13:08 +0800
Tag: v2.6.4
Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE
commit 5f8a99182890cac8ba76c42c4cce89147581a835
Author: Damyon Wiese <damyon@moodle.com>
Date: Tue, 17 Jun 2014 10:21:34 +0800
Tag: v2.6.4
Merge branch 'm26_MDL-45582' of git://github.com/greg-or/moodle-mod_assign into MOODLE_26_STABLE
commit 86af5cb87c01d66b487f1112b878bc5a3a70f58e
Author: Damyon Wiese <damyon@moodle.com>
Date: Tue, 10 Jun 2014 15:31:25 +0800
Tag: v2.6.4
Merge branch '45524-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE
commit 2f3c3abc1fd266bf61ad04c21b2efa4e2de5ff5d
Author: Damyon Wiese <damyon@moodle.com>
Date: Tue, 10 Jun 2014 14:08:30 +0800
Tag: v2.6.4
Merge branch 'wip-mdl-44309-m26' of https://github.com/deraadt/moodle into MOODLE_26_STABLE
commit 871a036c74dfa32e84027c33c0b389eea75f946b
Author: Damyon Wiese <damyon@moodle.com>
Date: Tue, 10 Jun 2014 13:52:18 +0800
Tag: v2.6.4
Merge branch 'MDL-45767_returnInstanceid_26' of https://github.com/moodlerooms/moodle into MOODLE_26_STABLE
commit eb6e5390c968a17e1615f015f4e55e012a6e2653
Author: Damyon Wiese <damyon@moodle.com>
Date: Tue, 10 Jun 2014 13:14:38 +0800
Tag: v2.6.4
Merge branch 'MDL-45763-26' of https://github.com/merrill-oakland/moodle into MOODLE_26_STABLE
commit 8beb255c10a31675886d02b5b4ccdcc4b1e0f486
Author: Damyon Wiese <damyon@moodle.com>
Date: Mon, 09 Jun 2014 12:43:04 +0800
Tag: v2.6.4
Merge branch 'MDL-39726-26' of https://github.com/merrill-oakland/moodle into MOODLE_26_STABLE
commit c800196f03cbafa167ea68ce619f000ff8b48cef
Author: Damyon Wiese <damyon@moodle.com>
Date: Mon, 09 Jun 2014 09:20:09 +0800
Tag: v2.6.4
Merge branch 'MDL-45714-26' of https://github.com/merrill-oakland/moodle into MOODLE_26_STABLE
commit 65f35498935d392c767fd036290e2879c62787ef
Author: Damyon Wiese <damyon@moodle.com>
Date: Tue, 03 Jun 2014 16:22:07 +0800
Tag: v2.6.4
Merge branch 'MDL-45592_26' of git://github.com/grabs/moodle into MOODLE_26_STABLE
commit 50df05ef78d060336b225fd90a80ae74bdd14ce4
Author: Damyon Wiese <damyon@moodle.com>
Date: Tue, 03 Jun 2014 13:10:16 +0800
Tag: v2.6.4
Merge branch 'm26_MDL-44098' of git://github.com/greg-or/moodle-mod_assign into MOODLE_26_STABLE
commit 322a1fa453e7c08db8110791ba3c334092dd91d4
Author: Damyon Wiese <damyon@moodle.com>
Date: Tue, 03 Jun 2014 11:58:52 +0800
Tag: v2.6.4
Merge branch 'MDL-45781_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE
commit c3131a4ac2019a2829f949c3f37be9b4e8e0048d
Author: Damyon Wiese <damyon@moodle.com>
Date: Mon, 26 May 2014 12:48:33 +0800
Tag: v2.6.4
Merge branch 'wip-MDL-45688-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE
commit cd2297972ba20435e6c377dd31c5ee106676f600
Author: Damyon Wiese <damyon@moodle.com>
Date: Mon, 26 May 2014 12:13:02 +0800
Tag: v2.6.4
Merge branch '45499-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE
commit 2a6cc872fff29d67e1499326b01c0542742317ca
Author: Damyon Wiese <damyon@moodle.com>
Date: Tue, 20 May 2014 13:30:37 +0800
Tag: v2.6.4
Merge branch 'm26_MDL-45583' of github.com:danmarsden/moodle into MOODLE_26_STABLE
commit 350e34d177b13f61f6721c4fcc15a8305e9aa455
Author: Damyon Wiese <damyon@moodle.com>
Date: Tue, 20 May 2014 13:29:30 +0800
Tag: v2.6.4
Merge branch 'MDL-45323-26' of git://github.com/lameze/moodle into MOODLE_26_STABLE
commit 4c2ba6794be80a991b2eb8b147f694725865e71d
Author: Damyon Wiese <damyon@moodle.com>
Date: Tue, 20 May 2014 09:01:24 +0800
Tag: v2.6.4
Merge branch '44974-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE
commit cbaad47bf27a12f245b487a95d6141ade13bc34b
Author: Damyon Wiese <damyon@moodle.com>
Date: Mon, 19 May 2014 20:47:49 +0800
Tag: v2.6.4
Merge branch 'MDL-45472-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE
commit 9ccd8759ea3e863f8f042d176642bc91c809ee6a
Author: Damyon Wiese <damyon@moodle.com>
Date: Mon, 19 May 2014 20:12:20 +0800
Tag: v2.6.4
Merge branch 'MDL-43833_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE
commit 5b26aca4373b4958954fe94150a7279a9149e018
Author: Damyon Wiese <damyon@moodle.com>
Date: Mon, 19 May 2014 20:07:00 +0800
Tag: v2.6.4
Merge branch 'MDL-45527-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
commit 2e0b5708f140d6d6d71852c7f42a22288ea73e2c
Author: Damyon Wiese <damyon@moodle.com>
Date: Mon, 19 May 2014 19:57:57 +0800
Tag: v2.6.4
Merge branch 'MDL-45455_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE
commit 60802ff32eb2cd0073c793183597cc0cc1436320
Author: Damyon Wiese <damyon@moodle.com>
Date: Mon, 19 May 2014 12:55:31 +0800
Tag: v2.6.4
Merge branch 'MDL-32543-26' of https://github.com/danielneis/moodle into MOODLE_26_STABLE
commit b29da693b62a59f43d159467bdff83169bcc8f67
Author: Damyon Wiese <damyon@moodle.com>
Date: Mon, 19 May 2014 12:43:45 +0800
Tag: v2.6.4
Merge branch 'MDL-23566_26' of https://github.com/aolley/moodle into MOODLE_26_STABLE
commit 9d14dcd64e13d3d4901c6ea0b2a5258592b2be44
Author: Damyon Wiese <damyon@moodle.com>
Date: Mon, 19 May 2014 12:20:38 +0800
Tag: v2.6.4
Merge branch 'MDL-44634-26' of https://github.com/dbezborodovrp/moodle into MOODLE_26_STABLE
commit d38ef5cfe00c0345146b535c0c813ece6e5f6c0d
Author: Damyon Wiese <damyon@moodle.com>
Date: Mon, 19 May 2014 11:53:34 +0800
Tag: v2.6.4
Merge branch '43995-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE
commit 967fe8ef0d260ce6ba196757976e76addc4e2321
Author: Damyon Wiese <damyon@moodle.com>
Date: Thu, 15 May 2014 15:34:09 +0800
Tag: v2.6.4
Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE
commit 3d5413d89a509e4136219b579374fdaababa8e93
Author: Damyon Wiese <damyon@moodle.com>
Date: Tue, 13 May 2014 15:56:12 +0800
Tag: v2.6.4
Merge branch 'MDL-41383-26' of git://github.com/jethac/moodle into MOODLE_26_STABLE