Git merges in Moodle 2.5.2 by Eloy Lafuente (stronk7)

commit 93e4ea20f20895cb49a2fee3ace554509e338e72
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 07 Sep 2013 20:11:59 +0800
Tag:    v2.5.2

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

commit f2900567a8aacbe4597e64fe47d4b00f89910a2a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Sep 2013 04:07:04 +0800
Tag:    v2.5.2

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

commit 247f3e95e7975c8003de49747d8af5bca5738902
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Sep 2013 21:11:41 +0800
Tag:    v2.5.2

Merge branch 'MDL-41568-en_fix-25' of git://github.com/mudrd8mz/moodle into MOODLE_25_STABLE

commit 14616c145ff047ff24340522f3e31f52df2cd318
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 28 Aug 2013 03:00:28 +0800
Tag:    v2.5.2

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

commit 19ed5ae02f6089367b677134cab588f429ff031a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 28 Aug 2013 01:46:00 +0800
Tag:    v2.5.2

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

commit 1bb7b654966813b04cda65348ba5774a3824e459
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 00:21:09 +0800
Tag:    v2.5.2

Merge branch 'w30_MDL-40679_m25_zlib' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit d03c0ef72d3e6b9ca40c069600116b1bf0c8a379
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 00:19:32 +0800
Tag:    v2.5.2

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

commit c8dd490281ae6d8881a1b44f03e7f8d0a1b3be3b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 00:01:19 +0800
Tag:    v2.5.2

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

commit 52affa8a9a888efe4f5b7b5e2f093af313623a1a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 19:58:30 +0800
Tag:    v2.5.2

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

commit e988493e68461b1e1bfc0fcc222e2b32dc3e4411
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 19:19:54 +0800
Tag:    v2.5.2

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

commit 932ad50a6ef395cbdf9247c08677ea21d6200dbf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 09:52:23 +0800
Tag:    v2.5.2

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

commit 2f956f40b6a79ed57149ab13da1af19c8db52e98
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 07:09:20 +0800
Tag:    v2.5.2

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

commit e024b7130afe7433e7cf26d1749630d493a6bd46
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 06:45:20 +0800
Tag:    v2.5.2

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

commit ed3a28dcecd483ed32538798bfeb96d91c3d38d8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 04:36:33 +0800
Tag:    v2.5.2

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

commit 55be97fba49cb9adbe6247e9f4c21c229aa72445
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 22 Jul 2013 23:41:01 +0800
Tag:    v2.5.2

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

commit b5d967cb1defa01eb26b34b406eebf7698309a26
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 06:41:19 +0800
Tag:    v2.5.2

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

commit c59f83cec25e62cf0564a7dbb7147e14962e73a0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 06:32:37 +0800
Tag:    v2.5.2

Merge branch 'w29_MDL-40611_m25_accesslibtest' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit cbd227ffae92511dac0dada922e06d719dbaea0a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 06:26:43 +0800
Tag:    v2.5.2

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

commit bc27ec579e036bd89d7e8252d0b08376a095f8fa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 06:17:43 +0800
Tag:    v2.5.2

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

commit 980746ce63ea1e6c8545d1f37e96b61c0c1bb521
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 04:02:23 +0800
Tag:    v2.5.2

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

commit 2ff8b13dee0b3d8ee860366991eff3790853b101
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 03:55:55 +0800
Tag:    v2.5.2

Merge branch 'w29_MDL-40423_m25_localsubdir' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit aeee792c86a2ef29d3f0dd85c5cfb7449b1aca54
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Jul 2013 15:46:27 +0800
Tag:    v2.5.2

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

commit ed405efb4c686e7d80fe0732e30d763fddff6e90
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Jul 2013 06:26:51 +0800
Tag:    v2.5.2

Merge branch 'w29_MDL-40571_m25_adminblocks' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 40aa1f4d88a75090de41a597c2028143c6a0f624
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Jul 2013 04:08:09 +0800
Tag:    v2.5.2

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

commit ad92b2f1ae60b8496d729ed2bd377fad923b03ef
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 15 Jul 2013 23:06:31 +0800
Tag:    v2.5.2

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