Git merges in Moodle 2.6.4 by Marina Glancy

commit 8f2db3c1a1c583f7ec6c2d6b68dbe7f561492ce7
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Jul 2014 13:51:57 +0800
Tag:    v2.6.4

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

commit 76b320818ab444a7699223a6ab76c045e4706edc
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Jun 2014 13:52:54 +0800
Tag:    v2.6.4

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

commit e0e6a127fa6d91da14b6348bc588ff7091bc02ac
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Jun 2014 13:29:20 +0800
Tag:    v2.6.4

Merge branch 'MDL-45044-m26-master' of git://github.com/dthies/moodle into MOODLE_26_STABLE

commit 827fbc4515706081e037a39168b6c455d944175a
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 16 Jun 2014 17:27:54 +0800
Tag:    v2.6.4

Merge branch 'MDL-45901_Quiz_MOODLE-26-STABLE' of git://github.com/nadavkav/moodle into MOODLE_26_STABLE

commit 0e96add9315fb8dab9229bf6a0aaf540e895b6c3
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 16 Jun 2014 14:24:22 +0800
Tag:    v2.6.4

Merge branch 'MDL-35648-v26' of git://github.com/danielneis/moodle into MOODLE_26_STABLE

commit 196c818a91ccf9664dca83b0118fdd78eef8329c
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 16 Jun 2014 14:23:01 +0800
Tag:    v2.6.4

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

commit 38083d7ff3ada17395c1fb1461d3e995c94af275
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Jun 2014 15:42:27 +0800
Tag:    v2.6.4

Merge branch 'MDL-20154-26' of git://github.com/merrill-oakland/moodle into MOODLE_26_STABLE

commit fde80766e212a046b61a2f084828955cf7ee2417
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Jun 2014 14:20:34 +0800
Tag:    v2.6.4

Merge branch '26STABLE-wip-MDL45846' of git://github.com/jennymgray/moodle into MOODLE_26_STABLE

commit a9af7d94e11e3f660955ceba95896f9af3677d80
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Jun 2014 17:25:22 +0800
Tag:    v2.6.4

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

commit a8b6eaa3c47be996c404e0409498d20e480aacd8
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 26 May 2014 14:46:55 +0800
Tag:    v2.6.4

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

commit 25f6bc111d8636f58f3dcff7d4bf541f61173a14
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 26 May 2014 14:46:47 +0800
Tag:    v2.6.4

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

commit 7c399a1ba0cb7043dccd7df35ad4055f81f5bf2a
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 26 May 2014 11:59:47 +0800
Tag:    v2.6.4

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

commit 1cbfc116120ac96d22b9455ef3bfdd9847edf537
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 20 May 2014 14:30:14 +0800
Tag:    v2.6.4

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

commit bf75a73cc5b4784ed49c168fe4d31010b5f3ce5f
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 20 May 2014 14:26:31 +0800
Tag:    v2.6.4

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

commit 97dc7bfc0bbdf66d2748982934a9754cc9cd2ebf
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 20 May 2014 14:22:51 +0800
Tag:    v2.6.4

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

commit f60c23a7812ec1db87f6e65b326d789557d7ee79
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 20 May 2014 14:16:27 +0800
Tag:    v2.6.4

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

commit 2b0b60631d8e80b928a38136c03b87e79f678a1c
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 20 May 2014 14:11:57 +0800
Tag:    v2.6.4

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

commit 0e46c03356ef2fc5a687d7b7e2125c9a71f1875b
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 20 May 2014 09:52:48 +0800
Tag:    v2.6.4

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

commit 709f70145ff521a936c3f307caaad2bf81a67b1e
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 19 May 2014 12:38:47 +0800
Tag:    v2.6.4

Merge branch 'wip-MDL-45483-MOODLE_26_STABLE' of https://github.com/kwiliarty/moodle into MOODLE_26_STABLE

commit 2538062907d6f95897782d762676c95929b7afde
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 14 May 2014 16:35:59 +0800
Tag:    v2.6.4

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