Git merges in Moodle 2.5.x by Marina Glancy

commit a267e328486bab57eda672d10505ae4de9783049
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 26 May 2014 14:47:54 +0800
Tag:    v2.5.7

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

commit ccffe26dbb3171f6116275ba4da7e1a26eb4d406
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 26 May 2014 14:47:45 +0800
Tag:    v2.5.7

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

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

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

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

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

commit c962724c1906fd3f4e81374031df4dbe962a2b68
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 20 May 2014 14:23:07 +0800
Tag:    v2.5.7

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

commit bced459a23fcde65ccfc5958d78fa9e6bc6d481d
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 20 May 2014 14:12:13 +0800
Tag:    v2.5.7

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

commit dd206a8daa6f45769cb6c9c650f1f6bda98822e2
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 20 May 2014 09:53:02 +0800
Tag:    v2.5.7

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

commit c24b3e19899869021fba3e18a0caa4bcd638c56a
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 19 May 2014 15:57:34 +0800
Tag:    v2.5.7

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

commit b91be533d11263f6e0b749d8af5ca49b0ce4ff63
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 14 May 2014 16:36:52 +0800
Tag:    v2.5.7

Merge branch 'wip-MDL-36670-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

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

commit 72c9dda9fd820ca5610d5300755493033c89c231
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 11 Feb 2014 14:43:22 +0800
Tag:    v2.5.5

Merge branch '28567-25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE

commit d977433b7a52112a99e0228200358711db4f0393
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 05 Feb 2014 15:58:42 +0800
Tag:    v2.5.5

Merge branch 'MDL-42339_m25' of git://github.com/rwijaya/moodle into MOODLE_25_STABLE

commit ccb30e1f7b3ea70f16f4d94d40222618490bdc06
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 17:35:17 +0800
Tag:    v2.5.5

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

commit 1038bbb275c41af61c904b56daf0464ee2e833fb
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 16:10:17 +0800
Tag:    v2.5.5

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

commit 8c3470e3ce5412063ee68e328055cfa7b8fe4899
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 13:52:11 +0800
Tag:    v2.5.5

Merge branch 'MDL-43440-25' of git://github.com/mr-russ/moodle into MOODLE_25_STABLE

commit c2a4d082a663064b017b471f63af33338904cb00
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 31 Jan 2014 14:11:15 +0800
Tag:    v2.5.5

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

commit f989165cb81d969c70c79fa55e47b02f02cd7777
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 17 Dec 2013 13:44:27 +0800
Tag:    v2.5.4

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

commit 61f6209afa244fba5ae22c2cd2545da7b41c494f
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 17 Dec 2013 08:24:25 +0800
Tag:    v2.5.4

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

commit 0ce9ea0df024d0e08690781088dd5021646c9e00
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 16 Dec 2013 09:28:55 +0800
Tag:    v2.5.4

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

commit a2712209f9296b91d6f1e144b0f4b4044260953c
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 12 Dec 2013 12:40:22 +0800
Tag:    v2.5.4

Merge branch 'mucupdates25' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 81ea8ce8b912d2d80b55a7ce4adc38923a8fcdda
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 11 Dec 2013 09:47:29 +0800
Tag:    v2.5.4

Merge branch 'MDL-43071-MOODLE_25_STABLE' of https://github.com/lucisgit/moodle into MOODLE_25_STABLE

commit e6a3977d3ec6708ff5aded59cba7d6444861b168
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 11 Dec 2013 08:48:31 +0800
Tag:    v2.5.4

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

commit 36d93b57e76476c889187ba16593f99d057c2ee1
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 11:47:20 +0800
Tag:    v2.5.4

Merge branch 'm25_MDL-43082_IE9_Compat_View_SVG_Say_No' of https://github.com/scara/moodle into MOODLE_25_STABLE

commit 930acdb3e99e871acd8eebb511dd01a0375d13ed
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 11:13:09 +0800
Tag:    v2.5.4

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

commit 78392c426effdae8a91cab6af1904f31d100b632
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 10 Dec 2013 10:57:39 +0800
Tag:    v2.5.4

Merge branch 'mdl42487-moodle25' of https://github.com/tlock/moodle into MOODLE_25_STABLE

commit 53ca1f85fdd2a66d5c381286a731022e36e1d9f2
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 15:29:08 +0800
Tag:    v2.5.4

Merge branch 'w50_MDL-42973_m25_addonupd' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit af76b176624ff5ecd4288c66c8a6ead6b536fb62
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Dec 2013 08:14:24 +0800
Tag:    v2.5.4

Merge branch 'wip-MDL-40213_M25' of git://github.com/gjb2048/moodle into MOODLE_25_STABLE

commit ccbd4e40c56fb15129ffb911636051729db0686d
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 20 Nov 2013 10:23:57 +0800
Tag:    v2.5.4

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

commit 96b5e3fc494367af7155bf5f175611788338a15e
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 13 Nov 2013 08:05:35 +0800
Tag:    v2.5.4

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

commit 63d05b24d9956931acc094d3a8797ccdbf0a8575
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Nov 2013 12:11:41 +0800
Tag:    v2.5.4

Merge branch 'MDL-42276_m25' of https://github.com/markn86/moodle into MOODLE_25_STABLE

commit 00be37804598c4025653a83e3f8ac2642bcef466
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Nov 2013 11:48:10 +0800
Tag:    v2.5.4

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

commit ce20ddf41a3bdf41aaa962ac3c0587f138bf3afd
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Nov 2013 08:24:07 +0800
Tag:    v2.5.4

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

commit af19ff0d79c2f5b078dd8bb7cc6563afc3460e79
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 11 Nov 2013 18:11:08 +0800
Tag:    v2.5.4

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

commit a41b923702befd8621fe067481358db3fdd8228e
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 07 Nov 2013 13:31:22 +0800
Tag:    v2.5.3

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

commit 36c9dadd675f29554e0507cb1c4ababcf3f19b81
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 06 Nov 2013 13:31:46 +0800
Tag:    v2.5.3

Merge branch 'MDL-42640-25' of https://github.com/colin-umn/moodle into MOODLE_25_STABLE

commit 5636172729676070eb119066fdfe57c668fdf138
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 05 Nov 2013 14:45:13 +0800
Tag:    v2.5.3

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

commit bdb51186d75efd7e2f319bf5b3126c83ffaffc31
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 16:16:44 +0800
Tag:    v2.5.3

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

commit a13c26eca36f747951e165199b50a1890cfbdb6b
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 14:28:15 +0800
Tag:    v2.5.3

Merge branch 'MDL-42429_m25' of https://github.com/markn86/moodle into MOODLE_25_STABLE

commit 7b6142193d6f736c1edb2d184e97df386274875d
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 14:23:12 +0800
Tag:    v2.5.3

Merge branch 'MDL-42566_m25' of https://github.com/markn86/moodle into MOODLE_25_STABLE

commit 01e7a7761958b70b34e0210058cf5c692893146a
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 13:58:11 +0800
Tag:    v2.5.3

Merge branch 'MDL-42465_m25' of https://github.com/markn86/moodle into MOODLE_25_STABLE

commit c82257cc8846241d7c506c09afb7e2025cd21392
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 13:14:57 +0800
Tag:    v2.5.3

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

commit b981f1b84711de254208d2e5276f4243779e7ef9
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 12:16:43 +0800
Tag:    v2.5.3

Merge branch 'MDL-38664_m25' of git://github.com/rwijaya/moodle into MOODLE_25_STABLE

commit b5ba65ebf1255e361976d091a656986c80c33b98
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Nov 2013 10:18:15 +0800
Tag:    v2.5.3

Merge branch 'MDL-42664-performance_measuring_filter_manager_25' of git://github.com/mudrd8mz/moodle into MOODLE_25_STABLE

commit 27fa761b1992d056d82b0002cb7c340e21462756
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 31 Oct 2013 19:17:58 +0800
Tag:    v2.5.3

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

commit 42863ec241420e212683eeabbabd8da991ed11c6
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 31 Oct 2013 18:17:08 +0800
Tag:    v2.5.3

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

commit 609aa78de1dedc1c1255c276fbea5cc5d9bdbc7e
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 31 Oct 2013 13:00:16 +0800
Tag:    v2.5.3

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

commit a4b421c1fb8b06e4285ac52bcf1d541693b960f5
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 24 Oct 2013 12:29:57 +0800
Tag:    v2.5.3

Merge branch 'MDL-35402_editor_rules_25' of git://github.com/davosmith/moodle into MOODLE_25_STABLE

commit b46fc7cefd955af0d0c658fc763ce078a98c4c0c
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 24 Oct 2013 11:15:39 +0800
Tag:    v2.5.3

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

commit 538e06f2b5ff424ee33edb39ffb4f711fa3e3dbf
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 23 Oct 2013 07:17:58 +0800
Tag:    v2.5.3

Merge branch 'w43_MDL-37813_m25_filterall' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 265b16589dd75d45c99c97c9aa8d5f45d1715fa5
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 22 Oct 2013 12:04:12 +0800
Tag:    v2.5.3

Merge branch 'MDL-26170_rss_25' of https://github.com/andyjdavis/moodle into MOODLE_25_STABLE

commit b2108d99550f15f0499e466920dfda369e8bd09d
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 22 Oct 2013 11:34:53 +0800
Tag:    v2.5.3

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

commit 575ec94611f8fbec732a0d1a10e85dddfed1e692
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 22 Oct 2013 11:08:45 +0800
Tag:    v2.5.3

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

commit 10ae2a6d0e0b956140f552ae97918e91b1f6d22d
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 21 Oct 2013 13:00:27 +0800
Tag:    v2.5.3

Merge branch 'w43_MDL-42386_m25_etag' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 071ac9ffddbd2d39a0dc6eb6dfdf1513082bd26f
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 15 Oct 2013 11:11:40 +0800
Tag:    v2.5.3

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

commit dd70b2b84adf35e999ea72280e061508ac40d6cf
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 10 Oct 2013 09:53:04 +0800
Tag:    v2.5.3

Merge branch 'MDL-37153_25' of https://github.com/pauln/moodle into MOODLE_25_STABLE

commit 573ceb9459e96f72359a557fc09e3b71eb74305c
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 08 Oct 2013 09:03:48 +0800
Tag:    v2.5.3

Merge branch 'MDL-25176_m25' of https://github.com/merrill-oakland/moodle into MOODLE_25_STABLE

commit 31f1464297b8c278bd1ecb905a38d429d1f91137
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Oct 2013 18:49:29 +0800
Tag:    v2.5.3

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

commit e4f0750a1287e5185b87a41531ffccd7421683d2
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 01 Oct 2013 18:43:25 +0800
Tag:    v2.5.3

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

commit d23f108197f1a24188ce7927825537c82a428ca4
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 30 Sep 2013 14:10:48 +0800
Tag:    v2.5.3

Merge branch 'MDL-41954-workshop-zero-variance_25' of git://github.com/mudrd8mz/moodle into MOODLE_25_STABLE

commit 9573950b9d7ba4d83edf79c54ce5ae6fe7aaa81a
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 27 Sep 2013 12:51:14 +0800
Tag:    v2.5.3

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

commit 90336898da2ab4e84cc29d02af07ef7786f82be0
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Sep 2013 19:43:18 +0800
Tag:    v2.5.3

Merge branch 'MDL-40550_25' of https://github.com/totara/openbadges into MOODLE_25_STABLE

commit 0184a31bad4ab8e9599fe8da394e156b5f67a812
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 24 Sep 2013 19:32:35 +0800
Tag:    v2.5.3

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

commit 1537f8241eb0b74bb63c32d6c0f13ac2e52ec49e
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 23 Sep 2013 17:17:34 +0800
Tag:    v2.5.3

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

commit 30f43b0e9cd1b44a681e2f6b447e997a360969c7
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 23 Sep 2013 12:40:35 +0800
Tag:    v2.5.3

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

commit eca39eaeee431794148a2909cc1174268fe4f6a3
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 16 Sep 2013 13:32:45 +0800
Tag:    v2.5.3

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

commit 71699c5a8104100c0e667af82a4fad1f3064d388
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 06 Aug 2013 12:39:26 +0800
Tag:    v2.5.2

Merge branch 'MDL-31226-MOODLE_25_STABLE' of https://github.com/lucisgit/moodle into MOODLE_25_STABLE

commit 0b1723fd577ec2310cc5754a9ceaa007904833e9
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 15:16:47 +0800
Tag:    v2.5.2

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

commit 25dcfa6f5400a3b17139a746239be43535bd724c
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 11:52:38 +0800
Tag:    v2.5.2

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

commit a4bd80565f42bc61dc6d9f580183473ba1c5e2b3
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 11:16:34 +0800
Tag:    v2.5.2

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

commit 153cb0b4c326cb0e125beb6a9e4787d1127d7082
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 10:31:53 +0800
Tag:    v2.5.2

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

commit 2adfb6528edaeb1db44e2bc2e212f4b9ab2bfbcd
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 10:20:40 +0800
Tag:    v2.5.2

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

commit e8a943e3610724214e40e511b268a1b11e6bec42
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 08:49:32 +0800
Tag:    v2.5.2

Merge branch 'wip-mdl-40933-m25' of git://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE

commit d11977ebc91ba3fd7cb4bf75f72a85af03e5eea6
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 17 Jul 2013 10:46:26 +0800
Tag:    v2.5.2

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

commit 996d7754571dce7937ed5d492c9350312890f77f
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 16 Jul 2013 14:11:29 +0800
Tag:    v2.5.2

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

commit da4a51d096ff27f965f75c924af9d372fe393319
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 16 Jul 2013 12:33:24 +0800
Tag:    v2.5.2

Merge branch 'MDL-39812_bootstrapbase_m25' of git://github.com/rwijaya/moodle into MOODLE_25_STABLE

commit 2500fc57d0b1d037225183385dc9e22b652bf206
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 15 Jul 2013 12:44:22 +0800
Tag:    v2.5.2

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

commit eccf42d9d987e97fa3cd191ede59d0b4f31d8dec
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 15 Jul 2013 10:42:57 +0800
Tag:    v2.5.2

Merge branch 'wip-MDL-39062-m25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE

commit 63c8f25b1bea72379ec4c4a311f09c629fd4a7b0
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 14:25:38 +0800
Tag:    v2.5.2

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

commit 0f2a0a3fb0c3cff4edbd3a8f759683a782df8a95
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 10:01:29 +0800
Tag:    v2.5.2

Merge branch 'm25_MDL-39832_Fix_Chrome_Issues_ETag_XSendfile_2ndRound' of https://github.com/scara/moodle into MOODLE_25_STABLE

commit 4d8ff7c8e27301a366954ba2fa271e45ad7f673b
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 09:09:44 +0800
Tag:    v2.5.2

Merge branch 'w28_MDL-40488_m25_admin' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 512ab8e262ea094d88f21dad73c6b6fde375530c
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 08:02:53 +0800
Tag:    v2.5.2

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

commit 1b0951a26a24b7e872c17bb3b87f01952527f1a6
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Jul 2013 19:36:12 +0800
Tag:    v2.5.2

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

commit 82043201ea9434a48177194dbe0b9b5e4d1e6fdd
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Jul 2013 14:34:28 +0800
Tag:    v2.5.2

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

commit 33025649f3292e14e99f32f71bc754fb7739b53e
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Jul 2013 09:31:52 +0800
Tag:    v2.5.2

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

commit 8526be5612f57b6b8a1984182ff4e7f5b15e6c86
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 13:38:20 +0800
Tag:    v2.5.1

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

commit 4d7c173514a63cba8acfb63feed89db9142cb829
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 10:57:06 +0800
Tag:    v2.5.1

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

commit 04597742cf5d4fbc22085433398eb9053868eeb0
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 09:13:26 +0800
Tag:    v2.5.1

Merge branch 'MDL-38079_25' of git://github.com/mr-russ/moodle into MOODLE_25_STABLE

commit 29a45089300d62cd8586eebf7ab6fbfdf192a6ae
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Jun 2013 08:40:39 +0800
Tag:    v2.5.1

Merge branch 'wip-MDL-40142-m25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE

commit 37d38a3125d752135d5d790d15b689faeaed652d
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 14 Jun 2013 11:50:50 +0800
Tag:    v2.5.1

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