Git merges in Moodle 2.5.4 by Marina Glancy

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