Git merges in Moodle 2.5.6 by Marina Glancy

commit d713240ef820137c074553c368ac32ad2a895071
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 08 May 2014 19:51:58 +0800
Tag:    v2.5.6

Merge branch 'MDL-45462-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit 18a1f91b2c785ce90eda2b074c70a820b4e802c7
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 07 May 2014 16:54:01 +0800
Tag:    v2.5.6

Merge branch 'MDL-45282_message_25' of git://github.com/andyjdavis/moodle into MOODLE_25_STABLE

commit 0f3f3b3b01962a78281e88058c752944ef28f4f0
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 07 May 2014 13:07:53 +0800
Tag:    v2.5.6

Merge branch 'MDL-45387-25' of git://github.com/jethac/moodle into MOODLE_25_STABLE

commit 72e9e72b170ed13725e83839184a06612561a45c
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 07 May 2014 13:07:44 +0800
Tag:    v2.5.6

Merge branch 'MDL-45201-25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE

commit 698f4d27dec4d6649a5741187099bd455c9ca9e2
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 May 2014 17:44:28 +0800
Tag:    v2.5.6

Merge branch 'MDL-34904-25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE

commit 42c95439ab19f30b18fd8ecdc0579824cd9d68a6
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 May 2014 17:20:58 +0800
Tag:    v2.5.6

Merge branch 'MDL-43319-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

commit ab0b3fc51ecca8d56d27a99d65bd1c17cec4a9ea
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 May 2014 17:20:45 +0800
Tag:    v2.5.6

Merge branch 'MDL-45342-25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE

commit 5f320315e5abcc6d48863959a423cb8dc338922b
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 May 2014 17:20:36 +0800
Tag:    v2.5.6

Merge branch 'MDL-44174-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit 5eb5b4d9bffdffd798f111c5f1557823925f1e97
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 May 2014 10:18:56 +0800
Tag:    v2.5.6

Merge branch 'wip-MDL-45127-25' of git://github.com/abgreeve/moodle into MOODLE_25_STABLE

commit d9dd21fd4e3ff9fd361c0ea2ec41918cca24bb66
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 01 May 2014 14:22:12 +0800
Tag:    v2.5.6

Merge branch 'MDL-44398-25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE

commit 0b4d7c9bc7c43df2509b9dea8e53bba175363262
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 01 May 2014 11:49:40 +0800
Tag:    v2.5.6

Merge branch 'MDL-45292-25' of git://github.com/jethac/moodle into MOODLE_25_STABLE

commit 458d13af33ac1ed5fbfc4fec4e60559c147cb240
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 30 Apr 2014 09:53:53 +0800
Tag:    v2.5.6

Merge branch 'MDL-27459-m25' of git://github.com/sammarshallou/moodle into MOODLE_25_STABLE

commit a169c0213d2f7db1dbb3869b7cba5695e75176dd
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 29 Apr 2014 12:50:54 +0800
Tag:    v2.5.6

Merge branch 'MDL-45289-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

commit b8f41dfa45d2742c175ae5d016e943a897d5b6ce
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 28 Apr 2014 20:18:43 +0800
Tag:    v2.5.6

Merge branch 'w18_MDL-45287_m25_dbreset' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 33ee767041e790da0e2ee56c6fe36b42b237622a
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 28 Apr 2014 18:03:38 +0800
Tag:    v2.5.6

Merge branch 'MDL-45266-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

commit 9a1227cf54050d41d5aba1fcc110069f3b5f6f64
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 28 Apr 2014 18:03:20 +0800
Tag:    v2.5.6

Merge branch 'MDL-45156_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit 72983c8569463e0ff36770222c7fb3efcd1bf7e9
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 28 Apr 2014 13:49:19 +0800
Tag:    v2.5.6

Merge branch 'MDL-45288_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit be2c92d3a1462d6afb4736048fa5924fea60a77e
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 28 Apr 2014 11:17:30 +0800
Tag:    v2.5.6

Merge branch 'MDL-44004-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit e4f066d1b1b63309b46b97306b614420114ccaaf
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 24 Apr 2014 14:14:13 +0800
Tag:    v2.5.6

Merge branch 'MDL-45234-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE

commit ba7a72d41397a22dabf7af3ce8082b49358b9e62
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Apr 2014 14:46:57 +0800
Tag:    v2.5.6

Merge branch 'MDL-45134-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit e7c8139f5376e356763751b0f46ca6ef831e4b40
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Apr 2014 13:26:18 +0800
Tag:    v2.5.6

Merge branch 'MDL-44991-m25' of git://github.com/sammarshallou/moodle into MOODLE_25_STABLE

commit fa4df78be0cd6020bbc0dcb89897ab6785b1618b
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Apr 2014 13:14:59 +0800
Tag:    v2.5.6

Merge branch 'MDL-44855-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE

commit 2f9f37bedd7d94a11197c25c5caa4a413bfdb3f3
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 22 Apr 2014 12:29:26 +0800
Tag:    v2.5.6

Merge branch 'MDL-43673_25' of git://github.com/stronk7/moodle into MOODLE_25_STABLE

commit 179a0809ae1684c8985615a83a637935d930ef6b
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 16 Apr 2014 11:52:33 +0800
Tag:    v2.5.6

Merge branch 'MDL-45081-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit 4842f37df590e39cecc5b45839b7198106332aea
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Apr 2014 11:16:08 +0800
Tag:    v2.5.6

Merge branch 'MDL-44891-m25' of git://github.com/sammarshallou/moodle into MOODLE_25_STABLE

commit af5f239548c1b2a657599605f13a0159ea4f2941
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Apr 2014 08:54:39 +0800
Tag:    v2.5.6

Merge branch 'MDL-42195-25' of git://github.com/damyon/moodle into MOODLE_25_STABLE

commit 52d88560e1816e6379c1cc6de9a084d1a6c2ae80
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 02 Apr 2014 09:47:02 +0800
Tag:    v2.5.6

Merge branch 'MDL-41063_25' of git://github.com/jmvedrine/moodle into MOODLE_25_STABLE

commit 1db4576ef7b0562c9205c62ab15a6f88f5947a30
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 02 Apr 2014 09:16:50 +0800
Tag:    v2.5.6

Merge branch 'm25_MDL-44753' of git://github.com/danmarsden/moodle into MOODLE_25_STABLE

commit 70dc247627ba6f70533a3e968a835e50dde891a4
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 17:41:31 +0800
Tag:    v2.5.6

Merge branch '25STABLE-wip-MDL44021' of git://github.com/jennymgray/moodle into MOODLE_25_STABLE

commit df1f81e3ec1071617b302c4648af79f1c4b49ac1
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 15:34:08 +0800
Tag:    v2.5.6

Merge branch 'W14_MDL-44862_m25_pgsocket' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 511fda4596e99a96ce07c71c30bb5f79e7a984a6
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 11:07:13 +0800
Tag:    v2.5.6

Merge branch 'MDL-44701_25' of git://github.com/aolley/moodle into MOODLE_25_STABLE

commit c08890750c85dd207e0232b72dd7b57d9f79b9b8
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Apr 2014 11:06:01 +0800
Tag:    v2.5.6

Merge branch 'MDL-44670-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit db0b8a91e8db3c8de916235c8141c580bd314c11
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 27 Mar 2014 16:52:13 +0800
Tag:    v2.5.6

Merge branch 'install_25_STABLE' of git://git.moodle.org/moodle-install into MOODLE_25_STABLE

commit 3c3468107124956a92a1ab202bfbbf6131a6e98b
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 25 Mar 2014 16:21:52 +0800
Tag:    v2.5.6

Merge branch 'mdl44573-moodle25' of git://github.com/tlock/moodle into MOODLE_25_STABLE

commit c047d164741d17892e63b044f9b83e708fd9dd09
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 25 Mar 2014 14:29:49 +0800
Tag:    v2.5.6

Merge branch 'MDL-44665_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit c7d46f034cf432718ac98a4e2a99e7cae12d2891
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 19 Mar 2014 10:36:07 +0800
Tag:    v2.5.6

Merge branch 'MDL-43341_25' of git://github.com/nobelium/moodle into MOODLE_25_STABLE

commit e8aa64fc906bad738985311275f329bb4ffe17ad
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 19 Mar 2014 09:57:02 +0800
Tag:    v2.5.6

Merge branch 'MDL-44141-m25' of git://github.com/sammarshallou/moodle into MOODLE_25_STABLE

commit b0eeaaacfec3ba8e915bf7aa2fefa8b0b2e16b44
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Mar 2014 17:41:00 +0800
Tag:    v2.5.6

Merge branch 'MDL-38636-25' of git://github.com/roelmann/moodle into MOODLE_25_STABLE

commit 5f2a9a89621d84b57d9c394d4065d8d1caaa3e32
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Mar 2014 16:04:49 +0800
Tag:    v2.5.6

Merge branch 'w12_MDL-44191_m25_mysql56' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 7c671ddb9c2363793e735dbec3f7cab224a289bd
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Mar 2014 15:33:43 +0800
Tag:    v2.5.6

Merge branch 'MDL-44246_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit d9a23f9dd83bdf11cf722bac20317e9c306af81e
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Mar 2014 14:46:53 +0800
Tag:    v2.5.6

Merge branch 'MDL-44416_25' of git://github.com/appalachianstate/moodle into MOODLE_25_STABLE

commit 1bd20a2402fbc3e500f9a6c6da9e94b32844c8ad
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Mar 2014 14:34:18 +0800
Tag:    v2.5.6

Merge branch 'MDL-44148-25' of git://github.com/jethac/moodle into MOODLE_25_STABLE

commit d2e55bfee49b785e0910561b4750b09b3cb788b4
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 18:19:57 +0800
Tag:    v2.5.6

Merge branch 'MDL-44588_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit 5f85fbc3e9a7ed677d9c4f8e1088991fbeb1edcb
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 18:13:28 +0800
Tag:    v2.5.6

Merge branch 'w12_MDL-44624_m25_dmltest' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 122dcf40819fd6eb1af263e8ba1d8c432c19ef92
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 17:10:27 +0800
Tag:    v2.5.6

Merge branch 'MDL-44356-M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE

commit 3a38900645956657ad3c5cb7e513b5093dd3165a
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 16:22:03 +0800
Tag:    v2.5.6

Merge branch 'm25_MDL-39568' of git://github.com/danmarsden/moodle into MOODLE_25_STABLE

commit c02da6acc7218bd0dd8ee0cd23878718033f3d29
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Mar 2014 14:29:21 +0800
Tag:    v2.5.6

Merge branch 'w12_MDL-44635_m25_ajaxlogs' of git://github.com/skodak/moodle into MOODLE_25_STABLE