Git merges in Moodle 2.6.4 by Dan Poltawski

commit 648bf857d3c4185438de57154a38c9478e33539e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jul 2014 21:17:58 +0800
Tag:    v2.6.4

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

commit 077703b235796035d4f043959818edbc2ed58774
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jul 2014 17:50:56 +0800
Tag:    v2.6.4

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

commit d830bd9a334852ed461cea005cc6e64685728ea3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Jul 2014 15:32:37 +0800
Tag:    v2.6.4

Merge branch 'MDL-46231-26-en_fix' of git://github.com/mudrd8mz/moodle into MOODLE_26_STABLE

commit 7047adfdbe7201f5a559336ac87e18139c3fe5ab
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Jul 2014 23:27:34 +0800
Tag:    v2.6.4

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

commit 47de7aac759f0e4754b4156b2df094e9c7878b5c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Jul 2014 23:10:28 +0800
Tag:    v2.6.4

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

commit 7b414e625847f5b520e2b70b3ba76c71c9c0bed2
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 03 Jul 2014 17:53:18 +0800
Tag:    v2.6.4

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

commit 92267ed9fefd121a49ab65a2de2086d49399d2af
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 02 Jul 2014 00:29:18 +0800
Tag:    v2.6.4

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

commit d520b925796e688a43a85b67f89ec3ae3d5068db
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 01 Jul 2014 23:34:32 +0800
Tag:    v2.6.4

Merge branch 'MDL-46036_survey_26' of https://github.com/andyjdavis/moodle into MOODLE_26_STABLE

commit e666c72330e99d311233c1075758907412b9a5cb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 01 Jul 2014 21:20:53 +0800
Tag:    v2.6.4

Merge branch 'MDL-46107_26' of https://github.com/totara/openbadges into MOODLE_26_STABLE

commit db1cf750bdcd936c64aa85fb0475c024b1f8b80d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 01 Jul 2014 17:39:18 +0800
Tag:    v2.6.4

Merge branch 'wip_MDL-46099_m26_userglobal' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit cb49ea51ebc09bc744de13714e2671497ff3d807
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Jun 2014 22:26:39 +0800
Tag:    v2.6.4

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

commit c1f759ab5045d6ea2b8e89c255ad43c94a809f87
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Jun 2014 22:09:54 +0800
Tag:    v2.6.4

Merge branch 'MDL-42467_database_26' of https://github.com/andyjdavis/moodle into MOODLE_26_STABLE

commit d183fbaf60dbca74fdbbd572ee2294e1f56a1a37
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Jun 2014 20:27:18 +0800
Tag:    v2.6.4

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

commit 0d0552d430fe3bb7e4c8bce4d900d795c23facb7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Jun 2014 18:45:32 +0800
Tag:    v2.6.4

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

commit f50f41c5072cc0b35a528d8696e29b6873e223a5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Jun 2014 15:56:47 +0800
Tag:    v2.6.4

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

commit 7c3e7cdae97ad12fa3433bd46baf2dac6c5efc41
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Jun 2014 22:26:03 +0800
Tag:    v2.6.4

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

commit 56f23662b129d6e3fb9493a9eebcfb57b5b1d565
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 May 2014 14:50:03 +0800
Tag:    v2.6.4

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

commit c5549ab4757b13bd0d9780e4b429d74e0c78fda5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 May 2014 19:02:43 +0800
Tag:    v2.6.4

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

commit 1ec46dca1dff091e1959ac6d0b5bb028641ce2d6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 May 2014 18:59:26 +0800
Tag:    v2.6.4

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

commit 7d5774aaa290bddde9dc9f3405fe54c203b51349
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 May 2014 10:03:09 +0800
Tag:    v2.6.4

Merge branch 'wip-MDL-45371-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

commit 239db05eecb04fd3d2657a6b35550b4759a42d65
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 20:32:02 +0800
Tag:    v2.6.4

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

commit af8bd4de8ec3e7e72c0d7ddaf70dd4f1c7eccb12
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 15:55:13 +0800
Tag:    v2.6.4

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

commit 67f6ebacff088032a06fc98b31190c5c701b66ec
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 12:21:58 +0800
Tag:    v2.6.4

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

commit 2b0ea3051d527a50cadac9a8c22dbad656dc5866
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 10:51:27 +0800
Tag:    v2.6.4

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

commit fa496d3fe18edd38d2fd8d220f6da10b8cb2c68f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 10:24:40 +0800
Tag:    v2.6.4

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

commit fa4ff1bd104d68dd4ac304c213d25e450d0e2928
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 10:14:24 +0800
Tag:    v2.6.4

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

commit 940269660f339bb491d18e6dd367544c009d5b61
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 09:50:51 +0800
Tag:    v2.6.4

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

commit ce400f61e672574636f07a7f851a6832d370e143
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 May 2014 18:43:17 +0800
Tag:    v2.6.4

Merge branch 'MDL-45432-MOODLE_26_STABLE' of https://github.com/lucisgit/moodle into MOODLE_26_STABLE

commit 2fa8db79cc68e45f5e884e04eaeccfd8cfd4e51b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 May 2014 15:07:53 +0800
Tag:    v2.6.4

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

commit 1ad0beaf4fa956da7942d1822c1bf60767a1fcba
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 May 2014 14:59:36 +0800
Tag:    v2.6.4

Merge branch 'wip-MDL-34914-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE