Git merges in Moodle 2.5.5 by Eloy Lafuente (stronk7)

commit 495d15279baf0b02aba2adf5686f7e21226e9def
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 07 Mar 2014 05:17:05 +0800
Tag:    v2.5.5

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

commit bf6f9d043d42d47faf214c03e59b5d65a06aa637
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 06 Mar 2014 07:37:09 +0800
Tag:    v2.5.5

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

commit 6e21938526085115227356c90c0f924b002bf675
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 20 Feb 2014 19:43:17 +0800
Tag:    v2.5.5

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

commit cb3385aefad9e987c98ec50a6b10409bc5775173
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Feb 2014 06:56:23 +0800
Tag:    v2.5.5

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

commit 28644233349a8d5789e2681af103d347110677c7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Feb 2014 06:25:44 +0800
Tag:    v2.5.5

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

commit 42651ea3f17cb2081f555513edbc1e08ec58a7b0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Feb 2014 09:12:30 +0800
Tag:    v2.5.5

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

commit ac58bd76b840ae7206862bfe5eed430d6ba3b950
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 13 Feb 2014 22:29:53 +0800
Tag:    v2.5.5

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

commit 06a25d72fad948c520f9fdc760c2a7c3d901427f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Feb 2014 17:41:10 +0800
Tag:    v2.5.5

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

commit ae9a8e772ab71d039615cbc3384386986960e1d5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Feb 2014 07:12:18 +0800
Tag:    v2.5.5

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

commit 85f47a3ebd92e767700ddd2121551b2390630fa5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Feb 2014 06:58:22 +0800
Tag:    v2.5.5

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

commit ba971d4ccae53b3a85f586eeff2afc91927900ee
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Feb 2014 00:58:49 +0800
Tag:    v2.5.5

Merge branch 'm25_MDL-37714' of git://github.com/greg-or/moodle into MOODLE_25_STABLE

commit 23cf5d3da267951603513f6435772c9261419f8a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 07:44:49 +0800
Tag:    v2.5.5

Merge branch 'm25_MDL-43797' of https://github.com/totara/moodle into MOODLE_25_STABLE

commit 68fe9b045c9e451d4b514585263a7d2612129aba
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 07:01:26 +0800
Tag:    v2.5.5

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

commit 2ee4c9957532294268b3db8ca032a209438b5b73
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 06:53:40 +0800
Tag:    v2.5.5

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

commit e3870e29d8558c026d928b5d26a81cda2bdfb718
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 04:11:23 +0800
Tag:    v2.5.5

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

commit 238e8a94f8c9cb1e7ae4075cf1c1070e8c90c0cf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 02:20:52 +0800
Tag:    v2.5.5

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

commit 7e84ef177d695c89b61e3a18a5536da50ca00c4d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 00:23:32 +0800
Tag:    v2.5.5

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

commit 333751af3a8100ccb9a1eabaf5c5138959f2dcb0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 00:04:47 +0800
Tag:    v2.5.5

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

commit f6590d5dd30786f884e9967a6fae411758ac6bf1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Jan 2014 19:02:51 +0800
Tag:    v2.5.5

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

commit e373f3bd042d04f2ac61fb823a2270fa192fe75d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Jan 2014 18:00:47 +0800
Tag:    v2.5.5

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

commit cd3c9e492b581171050f1b94b98830e5348dfb58
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jan 2014 19:38:29 +0800
Tag:    v2.5.5

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

commit 38dc2cc5bd91a5f12b657736d8fcf4795b51084e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 08:47:00 +0800
Tag:    v2.5.5

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

commit 1075da56e21eb04a5d3af2dd42948c848bc4e2e7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 08:44:56 +0800
Tag:    v2.5.5

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

commit 3dfaeb413b5df7bc7106250800c6d368e856d0f0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 08:14:01 +0800
Tag:    v2.5.5

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

commit 3dfb63df12e161ac2972eec76d3498a7eee0f595
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 07:21:58 +0800
Tag:    v2.5.5

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

commit 9a0d6896d0c50b333f00b5554bc2aefb7de0c63f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 07:17:48 +0800
Tag:    v2.5.5

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

commit db8c137e3583de9d7f63b0089fd3fbb7379c8341
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 07:03:03 +0800
Tag:    v2.5.5

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

commit 2ad45eaf5330ca3b35274e6bcf8e893cb6fd1fb1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 06:43:05 +0800
Tag:    v2.5.5

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

commit 2e3aa01daae548aedc157dbb5311686aee6ba1cb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 17 Jan 2014 01:51:04 +0800
Tag:    v2.5.5

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

commit cc3bfdc006531840e29f8b9f8aeb243e131a39fa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 16 Jan 2014 05:02:54 +0800
Tag:    v2.5.5

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

commit a89836aa2762ff9cef118f449a9ac239fca11c41
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jan 2014 02:08:02 +0800
Tag:    v2.5.5

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

commit 5d394d10a3432acfcec516ab0530e7f94d673377
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jan 2014 23:57:13 +0800
Tag:    v2.5.5

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

commit 712cb8569e69ab25e950b2da4fdc5fda2600e3a5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jan 2014 23:45:53 +0800
Tag:    v2.5.5

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

commit 5af2e8c082a05a6d4a7fab4117aed2fe962665eb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jan 2014 04:55:18 +0800
Tag:    v2.5.5

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