Git merges in Moodle 2.5.6 by Sam Hemelryk

commit 8f2747e5ca07af68deb467404bc527d406abe5f4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Apr 2014 05:10:09 +0800
Tag:    v2.5.6

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

commit 98778ee04f8ea303eca315e5a37e5632c9181e9a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Apr 2014 08:22:48 +0800
Tag:    v2.5.6

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

commit ebda3b8926e3838a5bc4fe0da74d93582d0f1f0c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Apr 2014 08:15:41 +0800
Tag:    v2.5.6

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

commit 66d76d519649fc21fc0acf4b978ba89f037e9ca5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 Apr 2014 07:03:18 +0800
Tag:    v2.5.6

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

commit bedf257b404a164fbb52ad32732fbe473a30292b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 Apr 2014 07:01:37 +0800
Tag:    v2.5.6

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

commit 8ca374466283da39e109e98665f8dbbbec074678
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 06:47:06 +0800
Tag:    v2.5.6

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

commit 697496bcac176b4323eef5a2a88945e19b8a3831
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 06:39:17 +0800
Tag:    v2.5.6

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

commit 6c4fa4d535a58eb5ceaa0013e06743f015def072
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 06:12:18 +0800
Tag:    v2.5.6

Merge branch 'mdl45012-moodle25' of git://github.com/tlock/moodle into MOODLE_25_STABLE

commit 0a11ddf4c7af2785edb70f2397410ff584160124
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 05:59:05 +0800
Tag:    v2.5.6

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

commit c3b94d995467b41fde12888c6e3899afba69f2c2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 05:18:24 +0800
Tag:    v2.5.6

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

commit fd266e48bc777a06723a41f2ca6648d8f4175ae1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 04:57:29 +0800
Tag:    v2.5.6

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

commit 0f2e18f9c8be218ecee8745dda164c36fff4cd8c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 Apr 2014 07:43:54 +0800
Tag:    v2.5.6

Merge branch 'w16_MDL-45100_m25_coursecontext' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 31371051659e5dc8b07753742e50757ee05ae2a3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 15 Apr 2014 12:47:47 +0800
Tag:    v2.5.6

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

commit 7ce77b73e2603be21acd3d483092da380db13c98
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Apr 2014 07:30:58 +0800
Tag:    v2.5.6

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

commit 6aefe4ec3c26cf68b6e49827abd22ba5962ffa88
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Apr 2014 08:04:49 +0800
Tag:    v2.5.6

Merge branch 'w14_MDL-44824_m25_subplugins' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit db1e66c1e067619e9c1cf05a85d67c89c232d88e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Apr 2014 04:27:05 +0800
Tag:    v2.5.6

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

commit 5e0e6a8c44a86891d562e2d76cc21ebd6b1c2d03
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Mar 2014 07:30:43 +0800
Tag:    v2.5.6

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

commit ee986da3ed17d714ed75dd176125c7df60f85fe0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 12:05:01 +0800
Tag:    v2.5.6

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

commit 29591a867f7977fbc40a567d7027d1d7a8f9376b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 09:41:02 +0800
Tag:    v2.5.6

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

commit 5cf880d88392deeddaecac4bba9b1a21fe78a6c6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 09:35:59 +0800
Tag:    v2.5.6

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

commit 069b3ae29c01c6d4c8a9a50dfb1ca09d312bb183
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 09:27:02 +0800
Tag:    v2.5.6

Merge branch 'mdl44499-moodle25' of https://github.com/tlock/moodle into MOODLE_25_STABLE

commit faa87eb28c4d84eb68d4405d71959d2624ad9049
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 06:48:28 +0800
Tag:    v2.5.6

Merge branch 'w12_MDL-44516_m25_purifier' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 7ad84b0c462d1236ff4fce293f79a4b13f80a58c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 04:03:26 +0800
Tag:    v2.5.6

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

commit 1dc93170ae3972cd712cc10cd148ed3f9e0d6118
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Mar 2014 09:13:12 +0800
Tag:    v2.5.6

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

commit f3e25119ad172c0d5d8e3cfa316bc5b614cd22c9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Mar 2014 06:56:55 +0800
Tag:    v2.5.6

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

commit c6f0baa3873313bdfbd4bd8b0a4aec2f20c5ee83
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Mar 2014 06:21:54 +0800
Tag:    v2.5.6

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

commit eb5d6cc5745b35e4d5588bbbe6cad7e05c6c21af
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Mar 2014 09:22:37 +0800
Tag:    v2.5.6

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

commit d59a7f97dd009d35049abd7ceee58da68c7bfc05
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Mar 2014 09:18:11 +0800
Tag:    v2.5.6

Merge branch 'w11_MDL-44451_m25_addonloc' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit e75faa20f64df69723410e0b15c1f8cb0247b513
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Mar 2014 03:54:32 +0800
Tag:    v2.5.6

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