Git merges in Moodle 2.5.2 by Damyon Wiese

commit 59abd58e9f8fb340b3ed8e2c609cd484c83b8982
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 04 Sep 2013 12:26:15 +0800
Tag:    v2.5.2

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

commit cdecb726ec54d436d892108016d60a253f4ead7f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 16:09:46 +0800
Tag:    v2.5.2

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

commit a36b1f9c65e7722c29c541b20891195b4d5f1768
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 14:38:28 +0800
Tag:    v2.5.2

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

commit efb7f5173a6646614eb9b0270d9bab8711a0d7e7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 14:28:58 +0800
Tag:    v2.5.2

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

commit 6093c3ddf8f59d60709f61e0bcc6765ccb8bf458
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 14:16:10 +0800
Tag:    v2.5.2

Merge branch 'MDL-32690_restoreMissingAssignment_25' of https://github.com/moodlerooms/moodle into MOODLE_25_STABLE

commit 18839cbbdc86ef69f00b030b83d9f211098aeed2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 02 Sep 2013 14:58:21 +0800
Tag:    v2.5.2

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

commit 01209ab96bd2005788d2ce55cfb5043e03ffb95d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 15:57:28 +0800
Tag:    v2.5.2

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

commit fe3ccd7e4d09bfd387c2b81e95d9641087adc04c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 15:08:13 +0800
Tag:    v2.5.2

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

commit 5212cb7d8fd8726e964d12128a417bbeb57b339c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 12:49:36 +0800
Tag:    v2.5.2

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

commit 082b0866bcb9c30364efff75ff626ee636a4ab27
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 12:29:21 +0800
Tag:    v2.5.2

Merge branch 'MDL-40447_M25' of https://github.com/nadavkav/moodle into MOODLE_25_STABLE

commit ab2a4e356232a998002fbaca520bae1a5b960236
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 10:08:19 +0800
Tag:    v2.5.2

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

commit 6472bbfbc7d14fef518e5e5b6270caf013c31bab
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 26 Aug 2013 16:10:02 +0800
Tag:    v2.5.2

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

commit 879330c428621072f9a5293d7f2f2d705bd87b3c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 26 Aug 2013 13:50:54 +0800
Tag:    v2.5.2

Merge branch 'mdl25_MDL-29004_wiki-fix-images-in-printer-friendly-view' of https://github.com/brki/moodle into MOODLE_25_STABLE

commit 29b8db0e0b237e3f00559cfb41bf4f4c6c606487
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 26 Aug 2013 09:43:58 +0800
Tag:    v2.5.2

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

commit c12ec889faa4dda307396912d01179a92ff4fa1f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 26 Aug 2013 09:29:53 +0800
Tag:    v2.5.2

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

commit 6bd0ce14ed081af6ba29e0dad85cf3c664fa5042
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 22 Aug 2013 11:21:46 +0800
Tag:    v2.5.2

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

commit fa2a822a17eb5279721fb73eeca75f95b5f91b75
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 16:15:14 +0800
Tag:    v2.5.2

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

commit f669d36b696c135bc1582308fead5b33deae1e76
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 15:57:59 +0800
Tag:    v2.5.2

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

commit 19ad0a365856f9bc4de3ec61406f9b033cf65e6c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 15:15:40 +0800
Tag:    v2.5.2

Merge branch 'w33_MDL-41112_m25_cachedist' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 1e28defac57184cad7c667785b523ac61e1a12b1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 14:49:08 +0800
Tag:    v2.5.2

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

commit fe8c182f0a1288c3d7d41cefb8b2f097d6350915
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 13:49:04 +0800
Tag:    v2.5.2

Merge branch 'MDL-27595-2_25' of https://github.com/bostelm/moodle into MOODLE_25_STABLE

commit 32fc11d77aa5d1b555b3c3a5590ed8a095a7a715
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 13:00:54 +0800
Tag:    v2.5.2

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

commit bf3ed270ec7a19f8fcf2236622e866744ea55627
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 12:30:10 +0800
Tag:    v2.5.2

Merge branch 'MDL-41122_2.5' of git://github.com/kastashov/moodle into MOODLE_25_STABLE

commit c67f7093a4cfe6b3f0dc02c7700ac99054a4fa5d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 Aug 2013 15:43:59 +0800
Tag:    v2.5.2

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

commit 97557f92f3a81aa3a071162fb55e43ac73669475
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 Aug 2013 15:38:10 +0800
Tag:    v2.5.2

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

commit 4fea0a3490c2bf4669b5e674f14c6579f869549c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 Aug 2013 13:51:25 +0800
Tag:    v2.5.2

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

commit 07cafa966a9955e15df40862cfbf060fd7b5b40d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 Aug 2013 13:17:03 +0800
Tag:    v2.5.2

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

commit e2bb8c1bbd688a7d26a8ee927ff067e295d65335
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 23 Jul 2013 15:54:10 +0800
Tag:    v2.5.2

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

commit 1ab82c67751425193ac9148eb635c73c12fbb192
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 22 Jul 2013 16:15:05 +0800
Tag:    v2.5.2

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

commit d99508f25b19de059e153cc3c3abf3a98256852e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 22 Jul 2013 16:02:47 +0800
Tag:    v2.5.2

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

commit 4217cea494fe5ec3cc70a5305af7c14bd7613e6b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 19 Jul 2013 09:25:04 +0800
Tag:    v2.5.2

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

commit 9dafb1ba898aa61d754f35d8a06a365afbc619f9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 21:30:29 +0800
Tag:    v2.5.2

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

commit e1982a25cdf51f203872b2004ce35a0687d043f5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 21:14:45 +0800
Tag:    v2.5.2

Merge branch 'wip-MDL-39299-stable25' of git://github.com/phalacee/moodle into MOODLE_25_STABLE

commit e811b5fbe181031724a37e1b9535063491d7557a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 13:29:38 +0800
Tag:    v2.5.2

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

commit f352c87f677e8f56156d17ffef611b77461d8ab1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 11:29:14 +0800
Tag:    v2.5.2

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

commit edb2b3c8a04347dba37eda440ef60d4844cb06c2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 10:25:14 +0800
Tag:    v2.5.2

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

commit 3afab77ad639725026f1ad0aeed7e1811ba505d3
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 12 Jul 2013 09:43:13 +0800
Tag:    v2.5.2

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

commit 94fbefa96b8e1e443d1156da123813474f2e46c6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 22:43:43 +0800
Tag:    v2.5.2

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

commit 218f77841739bbe56f318ca8d5a7943045024251
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 22:30:12 +0800
Tag:    v2.5.2

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

commit 641595c1fa74d2acc2e5f154f650daad428e02d7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 21:52:07 +0800
Tag:    v2.5.2

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

commit 234d90b20945fe9fc8d985991f649c0403e8f1d8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 15:16:16 +0800
Tag:    v2.5.2

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

commit 10061c1de79263e9e794db8f230a75cd9c18f820
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 13:27:28 +0800
Tag:    v2.5.2

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

commit a16698d10bb8c0b7c00c2fdaf772cfae1b75cf13
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 12:34:52 +0800
Tag:    v2.5.2

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

commit d5e3d9a06dfd5b4aeff0844a73fe54f3af73e218
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 11:12:19 +0800
Tag:    v2.5.2

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

commit 79fd52c6c3cb153dfb2e67ef3c7728fa2a8e07bd
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 11:05:39 +0800
Tag:    v2.5.2

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

commit ca4077c79ddc72a76bd845b5f570a9cd7c0d0c51
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 08 Jul 2013 15:14:55 +0800
Tag:    v2.5.2

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