Git merges in Moodle 2.6.4 by Eloy Lafuente (stronk7)

commit 61fdbd038e00a4de9d24b7858d90877e2c9a9679
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 Jul 2014 01:15:27 +0800
Tag:    v2.6.4

Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE

commit 792fb3ea61b4ec37ee028f44901da55ae86f0b7c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 08 Jul 2014 08:15:51 +0800
Tag:    v2.6.4

Merge branch '46208-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE

commit 333c9cd9df9b23883b11c5e76d92954399fa227a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Jul 2014 06:57:09 +0800
Tag:    v2.6.4

Merge branch 'wip-mdl-45889-m26' of https://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE

commit 5d4923ffccce2fb90004d186c7d5a56b304b6745
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Jul 2014 05:43:28 +0800
Tag:    v2.6.4

Merge branch '45209-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE

commit f7adf8a0102a1863168423113a5cc7d863fad92c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Jul 2014 01:23:46 +0800
Tag:    v2.6.4

Merge branch 'MDL-45961_MOODLE_26_STABLE' of https://github.com/NeillM/moodle into MOODLE_26_STABLE

commit 125ca896df003997bc8708a077cf52d74ec8f6e3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 26 Jun 2014 16:35:45 +0800
Tag:    v2.6.4

Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE

commit 9d5a2e6f1c419ed2325d44e2d01bc3867e59f04e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Jun 2014 07:34:02 +0800
Tag:    v2.6.4

Merge branch 'MDL-46079-m26' of https://github.com/sammarshallou/moodle into MOODLE_26_STABLE

commit 004659a6d0988a75c3d68943487cd88866f99837
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Jun 2014 02:09:35 +0800
Tag:    v2.6.4

Merge branch 'MDL-41258-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 4fdbb2424308f19c52afe81112b6903e499c8695
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Jun 2014 07:00:21 +0800
Tag:    v2.6.4

Merge branch 'MDL-45721_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE

commit 32b48768d47f030e79296257add966e697076a58
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Jun 2014 06:50:05 +0800
Tag:    v2.6.4

Merge branch 'MDL-39883-26' of git://github.com/ankitagarwal/moodle into MOODLE_26_STABLE

commit a23eb149a883f6548dfea88b93a052e7456cc26f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Jun 2014 06:03:42 +0800
Tag:    v2.6.4

Merge branch 'MDL-45764_generalTool_26' of https://github.com/moodlerooms/moodle into MOODLE_26_STABLE

commit d7b83310a7ca3e8528f1ea339b5c800683325213
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 Jun 2014 07:15:54 +0800
Tag:    v2.6.4

Merge branch 'MDL-45970_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE

commit a25529102c993341ba703cd3e17ef78a7fd7af08
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 Jun 2014 07:12:34 +0800
Tag:    v2.6.4

Merge branch 'MDL-45611-26' of git://github.com/phalacee/moodle into MOODLE_26_STABLE

commit 883656ceb83c3aa007da55c33a21ca9fb9787b3d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 Jun 2014 07:04:08 +0800
Tag:    v2.6.4

Merge branch 'wip-mdl-45719-m26' of https://github.com/deraadt/moodle into MOODLE_26_STABLE

commit c005cb89477b48207065e08f74261628282c98db
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 Jun 2014 06:51:46 +0800
Tag:    v2.6.4

Merge branch 'MDL-45870-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE

commit e17dc7bcfaa0d20491500524eb5904cc0fd29ae2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 12 Jun 2014 16:00:01 +0800
Tag:    v2.6.4

Merge branch 'MDL-42835-26' of http://github.com/damyon/moodle into MOODLE_26_STABLE

commit 8e9115725ef9f9c27c27fff877f3bc68e52c8612
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 11 Jun 2014 07:46:08 +0800
Tag:    v2.6.4

Merge branch 'm26_MDL-29708_Typo_Extra_Slashes' of https://github.com/scara/moodle into MOODLE_26_STABLE

commit 871c0ec7c538694095d517cb08ed5abf70e17791
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 11 Jun 2014 04:26:12 +0800
Tag:    v2.6.4

Merge branch 'MDL-45579-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE

commit e7bc2568a6a4919065ca04c3c83fd0549e60f84b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 11 Jun 2014 02:13:58 +0800
Tag:    v2.6.4

Merge branch 'MDL-45418_26' of git://github.com/stronk7/moodle into MOODLE_26_STABLE

commit 0034fd881645699cd379b0d7eb2d9432a8bb6933
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 10 Jun 2014 07:10:40 +0800
Tag:    v2.6.4

Merge branch 'MDL-42782-26' of git://github.com/jethac/moodle into MOODLE_26_STABLE

commit 4c3f6d562f4ee45f744cbab31bcb5ccf090eb4c7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 10 Jun 2014 06:37:34 +0800
Tag:    v2.6.4

Merge branch 'MDL-42835_26' of git://github.com/nobelium/moodle into MOODLE_26_STABLE

commit b2d285491cf12d122defa15ac3b47025dddfc4e6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 10 Jun 2014 03:49:44 +0800
Tag:    v2.6.4

Merge branch 'MDL-45574-m26' of https://github.com/sammarshallou/moodle into MOODLE_26_STABLE

commit 4d7544a3a0f6dd7543ccebfac9e6c05c0abbd769
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 10 Jun 2014 00:59:37 +0800
Tag:    v2.6.4

Merge branch 'wip-MDL-44501-26' of git://github.com/abgreeve/moodle into MOODLE_26_STABLE

commit 6e3438036a6815ae2259e55b29922de93f8b95b5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 05 Jun 2014 22:58:39 +0800
Tag:    v2.6.4

Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE

commit 9a5044fa5c10a00af40676f033087bf9a8f1c543
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Jun 2014 00:11:56 +0800
Tag:    v2.6.4

Merge branch 'MDL-44620_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE

commit acfc4c0b4dffb8f8c9d58eac469806b326a18911
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Jun 2014 18:11:52 +0800
Tag:    v2.6.4

Merge branch 'MDL-42953-26' of git://github.com/phalacee/moodle into MOODLE_26_STABLE

commit 9514d99333d823bd99b4fe8af878b7a3f7c7a332
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Jun 2014 08:20:02 +0800
Tag:    v2.6.4

Merge branch 'm26_MDL-45726' of https://github.com/danmarsden/moodle into MOODLE_26_STABLE

commit 6e415f6a598ff2eed333fbe3ed2bba6b5749db1b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 29 May 2014 18:51:28 +0800
Tag:    v2.6.4

Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE

commit cd07fceed1ceb4b78d1ed3b6882c37fe98395b67
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 22 May 2014 22:47:07 +0800
Tag:    v2.6.4

Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE