Git merges in Moodle 2.5.3 by Damyon Wiese

commit 836ab073a3af4ee817729d84b92f4ac4ee146606
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 08 Nov 2013 12:53:09 +0800
Tag:    v2.5.3

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

commit 5a3a53126772f529053e3182d774b7ce34acd7cc
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 07 Nov 2013 16:10:59 +0800
Tag:    v2.5.3

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

commit 9f4c5ff972345a5544db8d6f642e7fc27a92eabb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 07 Nov 2013 11:02:10 +0800
Tag:    v2.5.3

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

commit bff2785bbbc89c63362ba171521c7431cf266ebf
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 06 Nov 2013 10:37:09 +0800
Tag:    v2.5.3

Merge branch 'wip-MDL-41309-25STABLE' of https://github.com/jennymgray/moodle into MOODLE_25_STABLE

commit ef7b0158c9e1f91a4264b52753d5e2c9be8ce1bc
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Nov 2013 22:39:27 +0800
Tag:    v2.5.3

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

commit 7877f2a10d39f9883af06424728753fbe3339da1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Nov 2013 09:27:46 +0800
Tag:    v2.5.3

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

commit f4dfc6aec38f0549c98dd9df6d6f50353e0285e7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 15:22:58 +0800
Tag:    v2.5.3

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

commit 6885480643bd137bcb221c93b97f43576f709367
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 13:17:02 +0800
Tag:    v2.5.3

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

commit 1b6b8865bbee6228215c00525c8447ed9203ca40
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 11:55:44 +0800
Tag:    v2.5.3

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

commit 2116cfe31b1461cad54d30f3a8ae0b567c1fd816
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 11:00:55 +0800
Tag:    v2.5.3

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

commit 978271ca9b5682c3c2bfc7a6100f0481ea66664c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 10:49:21 +0800
Tag:    v2.5.3

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

commit 3e84d1746a44aeef4022469d1e16dd4ba72a466d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 10:00:24 +0800
Tag:    v2.5.3

Merge branch 'w45_MDL-42496_m25_addonredir' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit da9e7233b97c1b175339b8376ba9813e58fea923
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 09:41:46 +0800
Tag:    v2.5.3

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

commit 6c867463ae57940821bbcbd50a86775fd7678932
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 01 Nov 2013 21:50:15 +0800
Tag:    v2.5.3

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

commit 1cf4616825407b2b1904685ac7fbffb3fce1d695
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 30 Oct 2013 17:21:52 +0800
Tag:    v2.5.3

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

commit 4323d78919efffbde0b99c4f086700a19310584d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 30 Oct 2013 16:25:08 +0800
Tag:    v2.5.3

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

commit 657faa98d8397a6418d0a0b13cbefe1f4979d341
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 30 Oct 2013 10:53:52 +0800
Tag:    v2.5.3

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

commit 56ed66a537b1b6dd68132326ad25c3a43bde82f9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 29 Oct 2013 13:56:12 +0800
Tag:    v2.5.3

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

commit 39ab79ca19b028f353448311826dd354db37221c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 29 Oct 2013 13:42:58 +0800
Tag:    v2.5.3

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

commit 59f85555122b80a2cd992c69b42460b778e300c9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 28 Oct 2013 12:14:52 +0800
Tag:    v2.5.3

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

commit b842558dc2c3af227c34986bb3d282dc4dcb4d25
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 28 Oct 2013 10:58:54 +0800
Tag:    v2.5.3

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

commit 6e81b099fb08f8881d6235ad8792580c6336de61
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 23 Oct 2013 14:19:26 +0800
Tag:    v2.5.3

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

commit 023ab3da11f302a8cf2018c2ffce4dd664c0b1de
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 23 Oct 2013 13:41:46 +0800
Tag:    v2.5.3

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

commit 2840c2ae62598fa20dc590b0a00c31804de13afd
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 23 Oct 2013 11:53:16 +0800
Tag:    v2.5.3

Merge branch '25STABLE-wip-mdl-41339' of https://github.com/jennymgray/moodle into MOODLE_25_STABLE

commit 5964cfdb51af10ea6930e69aa2197e291450bb62
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 18 Oct 2013 13:29:03 +0800
Tag:    v2.5.3

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

commit 5cd7d9c9fe7dc3b82068c32e626db84ba12cfb89
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 16 Oct 2013 15:47:12 +0800
Tag:    v2.5.3

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

commit 51db769bbd657c76f97a9e71626194ce52e75292
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 16 Oct 2013 10:42:04 +0800
Tag:    v2.5.3

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

commit 5d56f7d1887aea599b2b13a6fde90a2bfb0ac824
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 15 Oct 2013 16:57:16 +0800
Tag:    v2.5.3

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

commit c0c2547bf6b234c967a656792dc202c84a853ea6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 14 Oct 2013 16:15:10 +0800
Tag:    v2.5.3

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

commit f5c356d06c5efcd53214d39156dbeacbedbf6b5d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 14 Oct 2013 14:27:48 +0800
Tag:    v2.5.3

Merge branch 'MDL-34586-25' of https://github.com/mackensen/moodle into MOODLE_25_STABLE

commit 15ba938554b95092edca897f830a2f4870d663c7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 14 Oct 2013 14:12:38 +0800
Tag:    v2.5.3

Merge branch 'MDL-34612-25' of https://github.com/mackensen/moodle into MOODLE_25_STABLE

commit 59e180d6d78287888e96916c4e3d14e4e78c7b8e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 09 Oct 2013 14:42:42 +0800
Tag:    v2.5.3

Merge branch 'w41_MDL-42047_m25_cohortdel' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit df253b3030f777cff975bb91ddcda738e44c4397
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 09 Oct 2013 13:35:43 +0800
Tag:    v2.5.3

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

commit 418d50d6a739dc69bd0cac57b06c9528d1917a80
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 09 Oct 2013 13:12:14 +0800
Tag:    v2.5.3

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

commit 46b46de84dbc226e174986331f2caecac0dd7dde
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 08 Oct 2013 14:34:03 +0800
Tag:    v2.5.3

Merge branch 'MDL-41520-MOODLE_25_STABLE-mod_lti-completion-view' of github.com:Trii/moodle into MOODLE_25_STABLE

commit 43eb9aadcd2106ff9524f0688df41e4fd1814923
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 08 Oct 2013 13:47:18 +0800
Tag:    v2.5.3

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

commit a59646ee31399450dda89ed5669a674550a101b8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 08 Oct 2013 12:49:07 +0800
Tag:    v2.5.3

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

commit b085cf96d32d13e02cc7b0cfa0641746de5e1222
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 02 Oct 2013 08:42:34 +0800
Tag:    v2.5.3

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

commit 190cd152a6fe2f4b52ed419ab29d984b3c78c171
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 01 Oct 2013 15:54:27 +0800
Tag:    v2.5.3

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

commit f0233c7acd2bd56f412ebd25261649c5c89fa3fa
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 01 Oct 2013 15:41:33 +0800
Tag:    v2.5.3

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

commit a2742ff0de890c9dfbbf03396e876ce8200c076e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 01 Oct 2013 15:36:25 +0800
Tag:    v2.5.3

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

commit df831ae75f92d02484880fbe519adee12f38bce4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 01 Oct 2013 14:56:53 +0800
Tag:    v2.5.3

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

commit 0e3841a2734e4487f491ba85b266c59d5be005d3
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Sep 2013 12:57:11 +0800
Tag:    v2.5.3

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

commit b0d5d6b0bb4a8a55250755eec7c7f2b1c59bf58e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Sep 2013 12:23:30 +0800
Tag:    v2.5.3

Merge branch 'MDL-41497-25' of https://github.com/willylee/moodle into MOODLE_25_STABLE

commit 3a15ac7c21f2fb92158b039f2c9f598743843514
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Sep 2013 11:59:08 +0800
Tag:    v2.5.3

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

commit 9c8c97c53ecbef7a56e89799b2267827204e7253
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Sep 2013 09:16:20 +0800
Tag:    v2.5.3

Merge branch 'MDL-41626-moodle25' of github.com:StudiUM/moodle into MOODLE_25_STABLE

commit fa2d417f36a2d6d1fd80b58fcc465fc6ae365367
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 09 Sep 2013 12:10:53 +0800
Tag:    v2.5.3

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

commit d2b7eee400211e393dc4e8ed162eebd9b1b9cf3f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 09 Sep 2013 11:45:30 +0800
Tag:    v2.5.3

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