Git merges in Moodle 2.6.3 by Marina Glancy
commit 30dc7fe149001a60d943737eaa1177b7673463c5
Author: Marina Glancy <marina@moodle.com>
Date: Thu, 08 May 2014 19:51:31 +0800
Tag: v2.6.3
Merge branch 'MDL-45462-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
commit da6b75343a9700277ebf2efc8f17bf636edd8e40
Author: Marina Glancy <marina@moodle.com>
Date: Wed, 07 May 2014 16:53:16 +0800
Tag: v2.6.3
Merge branch 'MDL-45282_message_26' of git://github.com/andyjdavis/moodle into MOODLE_26_STABLE
commit 9b33dd001fee9e589aa338b3c1c3c7339a3c37de
Author: Marina Glancy <marina@moodle.com>
Date: Wed, 07 May 2014 13:07:18 +0800
Tag: v2.6.3
Merge branch 'MDL-45201-26' of git://github.com/ankitagarwal/moodle into MOODLE_26_STABLE
commit 80efce1bc93c72f16e757b8afad4eb9d054bfc55
Author: Marina Glancy <marina@moodle.com>
Date: Wed, 07 May 2014 13:07:08 +0800
Tag: v2.6.3
Merge branch 'MDL-45387-26' of git://github.com/jethac/moodle into MOODLE_26_STABLE
commit 74d62545da9e13dadd77feee764b7bc6e031cdc8
Author: Marina Glancy <marina@moodle.com>
Date: Mon, 05 May 2014 17:44:02 +0800
Tag: v2.6.3
Merge branch 'MDL-34904-26' of git://github.com/ankitagarwal/moodle into MOODLE_26_STABLE
commit d1f5077f84417056acfe287278fd4d09acefa0cb
Author: Marina Glancy <marina@moodle.com>
Date: Mon, 05 May 2014 17:19:51 +0800
Tag: v2.6.3
Merge branch 'MDL-43319-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE
commit 8dfd2e2407afaac61f18004be2b49262cfeaec77
Author: Marina Glancy <marina@moodle.com>
Date: Mon, 05 May 2014 17:19:39 +0800
Tag: v2.6.3
Merge branch 'MDL-45342-26' of git://github.com/ankitagarwal/moodle into MOODLE_26_STABLE
commit 09bf74f26531c31f906eeca9b97873bb1c620dea
Author: Marina Glancy <marina@moodle.com>
Date: Mon, 05 May 2014 17:19:29 +0800
Tag: v2.6.3
Merge branch 'MDL-44174-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
commit a0a7521e5b16fa5bcba51d3ce614a09c3406c544
Author: Marina Glancy <marina@moodle.com>
Date: Mon, 05 May 2014 10:18:25 +0800
Tag: v2.6.3
Merge branch 'wip-MDL-45127-26' of git://github.com/abgreeve/moodle into MOODLE_26_STABLE
commit 3e1b758044a6864adf77a145ab043bab57c30e92
Author: Marina Glancy <marina@moodle.com>
Date: Thu, 01 May 2014 14:21:59 +0800
Tag: v2.6.3
Merge branch 'MDL-44398-26' of git://github.com/ankitagarwal/moodle into MOODLE_26_STABLE
commit 10d96f0e37522476d6c1e2420366d80639134314
Author: Marina Glancy <marina@moodle.com>
Date: Thu, 01 May 2014 12:20:07 +0800
Tag: v2.6.3
Merge branch 'MDL-45273_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE
commit 3d7b97824701791f82264e2c8bb8436f7d5e45dd
Author: Marina Glancy <marina@moodle.com>
Date: Thu, 01 May 2014 11:48:47 +0800
Tag: v2.6.3
Merge branch 'MDL-45292-26' of git://github.com/jethac/moodle into MOODLE_26_STABLE
commit 067a1bcb4d44dd13392d89d4f48cde5528d1cf3e
Author: Marina Glancy <marina@moodle.com>
Date: Wed, 30 Apr 2014 09:54:39 +0800
Tag: v2.6.3
Merge branch 'MDL-45315-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE
commit 049c8ed4d109ca498af12195dc8fa89d3240aa01
Author: Marina Glancy <marina@moodle.com>
Date: Wed, 30 Apr 2014 09:54:27 +0800
Tag: v2.6.3
Merge branch 'MDL-27459-m26' of git://github.com/sammarshallou/moodle into MOODLE_26_STABLE
commit a632d590f3c46e3fcfdd0bd81273025935c27dba
Author: Marina Glancy <marina@moodle.com>
Date: Tue, 29 Apr 2014 12:50:05 +0800
Tag: v2.6.3
Merge branch 'MDL-45289-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE
commit 93b2d3baca6a4be2991f70285079ef3480efb4a4
Author: Marina Glancy <marina@moodle.com>
Date: Mon, 28 Apr 2014 20:18:19 +0800
Tag: v2.6.3
Merge branch 'w18_MDL-45287_m26_dbreset' of git://github.com/skodak/moodle into MOODLE_26_STABLE
commit 795fb4aea477b095653cec3c7b5f98f7cd0ad6ae
Author: Marina Glancy <marina@moodle.com>
Date: Mon, 28 Apr 2014 18:02:36 +0800
Tag: v2.6.3
Merge branch 'MDL-45266-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE
commit 7b6bdc91e96334094e0521049065f5d4f8f6b002
Author: Marina Glancy <marina@moodle.com>
Date: Mon, 28 Apr 2014 18:02:25 +0800
Tag: v2.6.3
Merge branch 'MDL-45156_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
commit 14df84f65e294b18be4ff15282a8ffc87bc756f7
Author: Marina Glancy <marina@moodle.com>
Date: Mon, 28 Apr 2014 13:49:02 +0800
Tag: v2.6.3
Merge branch 'MDL-45288_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
commit 7ca387b3cfbede0ccccaf9b1de5a5c4098971947
Author: Marina Glancy <marina@moodle.com>
Date: Mon, 28 Apr 2014 13:04:08 +0800
Tag: v2.6.3
Merge branch 'MDL-44614_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
commit 4f214c3b644da6ecd8b12056b32db19e552857c9
Author: Marina Glancy <marina@moodle.com>
Date: Mon, 28 Apr 2014 11:17:06 +0800
Tag: v2.6.3
Merge branch 'MDL-44004-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
commit 1f2e95e7ebfd9a9bfa348abc6afa67352a02cba1
Author: Marina Glancy <marina@moodle.com>
Date: Mon, 28 Apr 2014 10:46:50 +0800
Tag: v2.6.3
Merge branch 'm26_MDL-45210' of git://github.com/totara/moodle into MOODLE_26_STABLE
commit 5db4854d64b7491ed3df9af742b2c32167047cce
Author: Marina Glancy <marina@moodle.com>
Date: Wed, 23 Apr 2014 14:46:16 +0800
Tag: v2.6.3
Merge branch 'MDL-45134-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
commit b3799a8678c20b5f7412a17cd338721b8472ef4b
Author: Marina Glancy <marina@moodle.com>
Date: Wed, 23 Apr 2014 13:25:38 +0800
Tag: v2.6.3
Merge branch 'MDL-44991-m26' of git://github.com/sammarshallou/moodle into MOODLE_26_STABLE
commit b212e892313bf6a9d0af530ca8f91a0121013d20
Author: Marina Glancy <marina@moodle.com>
Date: Wed, 23 Apr 2014 13:13:56 +0800
Tag: v2.6.3
Merge branch 'MDL-44855-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE
commit 79040c7534e338a2f50255d2225f1cc7d7281783
Author: Marina Glancy <marina@moodle.com>
Date: Tue, 22 Apr 2014 12:28:54 +0800
Tag: v2.6.3
Merge branch 'MDL-43673_26' of git://github.com/stronk7/moodle into MOODLE_26_STABLE
commit 65b84ebe7d4b382e6cd174cec2a650164b0dbbac
Author: Marina Glancy <marina@moodle.com>
Date: Wed, 16 Apr 2014 14:45:00 +0800
Tag: v2.6.3
Merge branch 'MDL-44951-26' of git://github.com/jethac/moodle into MOODLE_26_STABLE
commit 29088f4bf52449a3a46ec0387ceed3fe3b0209e6
Author: Marina Glancy <marina@moodle.com>
Date: Wed, 16 Apr 2014 11:52:16 +0800
Tag: v2.6.3
Merge branch 'MDL-45081-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
commit 28ff871c4af731575ea1635bf071ee01003ec2ab
Author: Marina Glancy <marina@moodle.com>
Date: Tue, 15 Apr 2014 14:34:48 +0800
Tag: v2.6.3
Merge branch 'MDL-45035-26' of git://github.com/ankitagarwal/moodle into MOODLE_26_STABLE
commit 6520c5362bd656c367ab012e5c4ee10ad4952804
Author: Marina Glancy <marina@moodle.com>
Date: Tue, 08 Apr 2014 11:15:39 +0800
Tag: v2.6.3
Merge branch 'MDL-44891-m26' of git://github.com/sammarshallou/moodle into MOODLE_26_STABLE
commit 1ec21eb0cdd3469aa2e2ccd72b8a8e28992f5e9e
Author: Marina Glancy <marina@moodle.com>
Date: Tue, 08 Apr 2014 08:54:27 +0800
Tag: v2.6.3
Merge branch 'MDL-42195-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE
commit 87618534eb5b16c2e2fd13dbe7ad299f764644dd
Author: Marina Glancy <marina@moodle.com>
Date: Tue, 08 Apr 2014 08:54:14 +0800
Tag: v2.6.3
Merge branch 'm26_MDL-44938' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE
commit fce220eb97ef7471bc5719db73184d658f4a3ee5
Author: Marina Glancy <marina@moodle.com>
Date: Mon, 07 Apr 2014 16:16:47 +0800
Tag: v2.6.3
Merge branch 'wip-mdl-44873-m26' of git://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE
commit e0f47ce98c9abe92be2d0c7336ab383d318faecb
Author: Marina Glancy <marina@moodle.com>
Date: Wed, 02 Apr 2014 09:46:50 +0800
Tag: v2.6.3
Merge branch 'MDL-41063_26' of git://github.com/jmvedrine/moodle into MOODLE_26_STABLE
commit 7b5cd3154d8573ae6c6a1917bb4474c25cde2854
Author: Marina Glancy <marina@moodle.com>
Date: Wed, 02 Apr 2014 09:16:26 +0800
Tag: v2.6.3
Merge branch 'm26_MDL-44753' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE
commit 4c0e7741c3b81cd1be89f3c317c0dbb0baf37ea3
Author: Marina Glancy <marina@moodle.com>
Date: Tue, 01 Apr 2014 17:40:57 +0800
Tag: v2.6.3
Merge branch '26STABLE-wip-MDL44021' of git://github.com/jennymgray/moodle into MOODLE_26_STABLE
commit 0cbcd72e8f2ef662267035148e726be2af0e0f8b
Author: Marina Glancy <marina@moodle.com>
Date: Tue, 01 Apr 2014 15:33:54 +0800
Tag: v2.6.3
Merge branch 'W14_MDL-44862_m26_pgsocket' of git://github.com/skodak/moodle into MOODLE_26_STABLE
commit d19792d5dea6ae0bb9ddaddc358a392ee2a161b2
Author: Marina Glancy <marina@moodle.com>
Date: Tue, 01 Apr 2014 13:52:52 +0800
Tag: v2.6.3
Merge branch 'MDL-44746_m26' of git://github.com/markn86/moodle into MOODLE_26_STABLE
commit 3b7b097f2acf66c8b304f4d3779ecb8da105a5f2
Author: Marina Glancy <marina@moodle.com>
Date: Tue, 01 Apr 2014 11:06:48 +0800
Tag: v2.6.3
Merge branch 'MDL-44701_26' of git://github.com/aolley/moodle into MOODLE_26_STABLE
commit 1a0bc77645e18cca61c760eab06b5d9b54320dd3
Author: Marina Glancy <marina@moodle.com>
Date: Tue, 01 Apr 2014 11:05:45 +0800
Tag: v2.6.3
Merge branch 'MDL-44670-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
commit 37de06026348fec3355a5fc31ed237aba7cfd5d0
Author: Marina Glancy <marina@moodle.com>
Date: Tue, 01 Apr 2014 11:05:09 +0800
Tag: v2.6.3
Merge branch 'MDL-44590-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE
commit b3aed4e5aa114dbbeb572cba7581f7b63d404470
Author: Marina Glancy <marina@moodle.com>
Date: Tue, 01 Apr 2014 10:40:07 +0800
Tag: v2.6.3
Merge branch 'MDL-44837-m26' of git://github.com/sammarshallou/moodle into MOODLE_26_STABLE
commit ea3d172274bc47e50d8b776fe6556ed0838f8fec
Author: Marina Glancy <marina@moodle.com>
Date: Tue, 01 Apr 2014 10:37:56 +0800
Tag: v2.6.3
Merge branch 'wip_MDL-44854_M26' of git://github.com/gjb2048/moodle into MOODLE_26_STABLE
commit cc247afe186814c4025b0ebd2f5516a0cd33f17a
Author: Marina Glancy <marina@moodle.com>
Date: Tue, 01 Apr 2014 10:36:39 +0800
Tag: v2.6.3
Merge branch 'wip-MDL-44850_M26' of git://github.com/gjb2048/moodle into MOODLE_26_STABLE
commit 26a44fc7bb5271e28b85103ee67413c5804f29b0
Author: Marina Glancy <marina@moodle.com>
Date: Mon, 31 Mar 2014 12:47:14 +0800
Tag: v2.6.3
Merge branch 'MDL-44822_26' of git://github.com/aolley/moodle into MOODLE_26_STABLE
commit 6f29595ebaa85b8c9eb72ef7c49d5f5e6f257fd1
Author: Marina Glancy <marina@moodle.com>
Date: Thu, 27 Mar 2014 16:52:19 +0800
Tag: v2.6.3
Merge branch 'install_26_STABLE' of git://git.moodle.org/moodle-install into MOODLE_26_STABLE
commit 15ca2aede6b008ac2341317e99af227bdca0434e
Author: Marina Glancy <marina@moodle.com>
Date: Tue, 25 Mar 2014 16:21:20 +0800
Tag: v2.6.3
Merge branch 'mdl44573-moodle26' of git://github.com/tlock/moodle into MOODLE_26_STABLE
commit 0f10b86557bff36ff759efbf2bdcfe7f236a0eb6
Author: Marina Glancy <marina@moodle.com>
Date: Tue, 25 Mar 2014 14:29:23 +0800
Tag: v2.6.3
Merge branch 'MDL-44665_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE
commit 140caa5b67afb686d5b73b046ea2d8358e908dd9
Author: Marina Glancy <marina@moodle.com>
Date: Wed, 19 Mar 2014 10:35:44 +0800
Tag: v2.6.3
Merge branch 'MDL-43341_26' of git://github.com/nobelium/moodle into MOODLE_26_STABLE
commit c21f8f13e504e4b280709b3ab69b705360949e07
Author: Marina Glancy <marina@moodle.com>
Date: Wed, 19 Mar 2014 09:50:11 +0800
Tag: v2.6.3
Merge branch 'MDL-44141-m26' of git://github.com/sammarshallou/moodle into MOODLE_26_STABLE
commit d64521fec2d9ab4ede46145bee592e03b50c3fa2
Author: Marina Glancy <marina@moodle.com>
Date: Tue, 18 Mar 2014 17:40:09 +0800
Tag: v2.6.3
Merge branch 'MDL-38636-26' of git://github.com/roelmann/moodle into MOODLE_26_STABLE
commit 2aacf70ebd773105bd8c7f7447fb5eb80977807b
Author: Marina Glancy <marina@moodle.com>
Date: Tue, 18 Mar 2014 16:04:16 +0800
Tag: v2.6.3
Merge branch 'w12_MDL-44191_m26_mysql56' of git://github.com/skodak/moodle into MOODLE_26_STABLE
commit 99c8dbc2dd65abaf406102324ce93b0a74aa98fe
Author: Marina Glancy <marina@moodle.com>
Date: Tue, 18 Mar 2014 15:33:20 +0800
Tag: v2.6.3
Merge branch 'MDL-44246_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
commit 7e0af0cdd54abba73d5acf90251fa926fef65929
Author: Marina Glancy <marina@moodle.com>
Date: Tue, 18 Mar 2014 14:46:25 +0800
Tag: v2.6.3
Merge branch 'MDL-44416_26' of git://github.com/appalachianstate/moodle into MOODLE_26_STABLE
commit cb470c3c706fdd1c7369ee190052d81980e0954e
Author: Marina Glancy <marina@moodle.com>
Date: Tue, 18 Mar 2014 14:33:42 +0800
Tag: v2.6.3
Merge branch 'MDL-44148-26' of git://github.com/jethac/moodle into MOODLE_26_STABLE
commit 031d1e3f7d3919cb60f08049c0aace82e5a7e455
Author: Marina Glancy <marina@moodle.com>
Date: Mon, 17 Mar 2014 18:19:19 +0800
Tag: v2.6.3
Merge branch 'MDL-44588_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE
commit 234e7b006639172c82806f712260b8470be2da3c
Author: Marina Glancy <marina@moodle.com>
Date: Mon, 17 Mar 2014 18:12:55 +0800
Tag: v2.6.3
Merge branch 'w12_MDL-44624_m26_dmltest' of git://github.com/skodak/moodle into MOODLE_26_STABLE
commit 682f0db9f6b8c5a8f1360ae5caace4abc71cc083
Author: Marina Glancy <marina@moodle.com>
Date: Mon, 17 Mar 2014 17:09:47 +0800
Tag: v2.6.3
Merge branch 'MDL-44356-M26' of git://github.com/lazydaisy/moodle into MOODLE_26_STABLE
commit 322baf1570174f73fc6c3bdc02bd85520f57df13
Author: Marina Glancy <marina@moodle.com>
Date: Mon, 17 Mar 2014 16:21:33 +0800
Tag: v2.6.3
Merge branch 'm26_MDL-39568' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE
commit b28a4887f57b1a3b5cdc2ad03b6fa59434cb7f23
Author: Marina Glancy <marina@moodle.com>
Date: Mon, 17 Mar 2014 14:29:42 +0800
Tag: v2.6.3
Merge branch 'w12_MDL-44635_m26_ajaxlogs' of git://github.com/skodak/moodle into MOODLE_26_STABLE
commit 1cd64d12081adf5e652f1a2c5d315a114d830ca7
Author: Marina Glancy <marina@moodle.com>
Date: Mon, 17 Mar 2014 13:53:01 +0800
Tag: v2.6.3
Merge branch 'w12_MDL-44339_m26_testdebug' of git://github.com/skodak/moodle into MOODLE_26_STABLE