Git merges in Moodle 3.0.4 by David Monllao

commit 20460bd637baaae932daf3e3d954a91e4854c635
Author: David Monllao <davidm@moodle.com>
Date:   Fri, 06 May 2016 16:15:04 +0800
Tag:    v3.0.4

Merge branch 'install_30_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_30_STABLE

commit bc1d0d15da4129d73b4076edf485a6aa2eff0dd4
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 03 May 2016 13:03:33 +0800
Tag:    v3.0.4

Merge branch 'wip-MDL-53402-30' of git://github.com/abgreeve/moodle into MOODLE_30_STABLE

commit 222bb751c95b7589efc551ba4716e793aa1d84da
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 03 May 2016 10:28:44 +0800
Tag:    v3.0.4

Merge branch 'MDL-53899-30-pluginperm' of git://github.com/mudrd8mz/moodle into MOODLE_30_STABLE

commit 0a274ff84e48bb147d01f7e25a3b23837d7d7a2d
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 03 May 2016 09:58:55 +0800
Tag:    v3.0.4

Merge branch 'MDL-51142-30' of git://github.com/damyon/moodle into MOODLE_30_STABLE

commit 1bd5e7f579d9fd37d5e53377760284c6da1a6bc6
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 02 May 2016 15:54:16 +0800
Tag:    v3.0.4

Merge branch 'MDL-53901-30' of git://github.com/damyon/moodle into MOODLE_30_STABLE

commit 8c46d78dbab156253e9d9b52f20b6f3d3910886d
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 02 May 2016 15:38:21 +0800
Tag:    v3.0.4

Merge branch 'MDL-53635-30' of git://github.com/jleyva/moodle into MOODLE_30_STABLE

commit a6f8c022f6618b578d15aafffb6635927f587c3c
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 02 May 2016 10:47:45 +0800
Tag:    v3.0.4

Merge branch 'MDL-53980-30-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_30_STABLE

commit 44df7437f9368bb532cce03faa988ec2f0e1c21a
Author: David Monllao <davidm@moodle.com>
Date:   Thu, 28 Apr 2016 10:42:11 +0800
Tag:    v3.0.4

Merge branch 'MDL-53928_30' of git://github.com/stronk7/moodle into MOODLE_30_STABLE

commit e37906c31e4820cb419077eef432dc4cb7db5ab6
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 26 Apr 2016 11:12:44 +0800
Tag:    v3.0.4

Merge branch 'MDL-52550-30' of git://github.com/cameron1729/moodle into MOODLE_30_STABLE

commit 5d1b9e7b003d42791054118b4da4af9da7c96b53
Author: David Monllao <davidm@moodle.com>
Date:   Wed, 20 Apr 2016 15:53:32 +0800
Tag:    v3.0.4

Merge branch 'MDL-53757_m30' of git://github.com/markn86/moodle into MOODLE_30_STABLE

commit 5401e6b923b00eb9c09423b08bbac1fbc1897d12
Author: David Monllao <davidm@moodle.com>
Date:   Wed, 20 Apr 2016 11:16:05 +0800
Tag:    v3.0.4

Merge branch 'MDL-53676_30' of https://github.com/wjroes/moodle into MOODLE_30_STABLE

commit 7f438e833e22a0817b77ae9e60eb0c65bb09ed38
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 12 Apr 2016 11:31:30 +0800
Tag:    v3.0.4

Merge branch 'MDL-53007_30_STABLE' of https://github.com/marxjohnson/moodle into MOODLE_30_STABLE

commit c9db0e876b1deeca1177a5aea7b5f092d0a4d46f
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 12 Apr 2016 10:54:24 +0800
Tag:    v3.0.4

Merge branch 'MDL-53770-30' of git://github.com/marinaglancy/moodle into MOODLE_30_STABLE

commit 92b0b88db1a1476f115e6035e2b4cf457e6afa9b
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 29 Mar 2016 15:57:16 +0800
Tag:    v3.0.4

Merge branch 'MDL-53356-30' of git://github.com/cameron1729/moodle into MOODLE_30_STABLE

commit 0a02b7cb0286fd210741db4aaf88bef57c146ee0
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 29 Mar 2016 15:43:41 +0800
Tag:    v3.0.4

Merge branch 'MDL-53432-git-less-css-MOODLE_30_STABLE' of https://github.com/brendanheywood/moodle into MOODLE_30_STABLE

commit 5948df3878c398010317ab1c94fcb82dcb20be65
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 29 Mar 2016 14:23:53 +0800
Tag:    v3.0.4

Merge branch 'wip-mdl-53434-m30' of https://github.com/rajeshtaneja/moodle into MOODLE_30_STABLE

commit 634d36641e565d0985e5bb4e350d5f436cf27df7
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 29 Mar 2016 12:58:52 +0800
Tag:    v3.0.4

Merge branch 'MDL-52646_30' of https://github.com/wjroes/moodle into MOODLE_30_STABLE

commit 07111d3af6b47201e561c78d71f26fbb97219e59
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 29 Mar 2016 12:56:05 +0800
Tag:    v3.0.4

Merge branch 'wip-MDL-52760-m30' of https://github.com/marinaglancy/moodle into MOODLE_30_STABLE

commit b9114ec746b0ec8b60936dc3d7bf859c22b237a7
Author: David Monllao <davidm@moodle.com>
Date:   Wed, 23 Mar 2016 09:20:35 +0800
Tag:    v3.0.4

Merge branch 'wip-MDL-53254-m30' of https://github.com/marinaglancy/moodle into MOODLE_30_STABLE

commit 557bdeba78295a233a0c0a66833d6f58f14341c4
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 21 Mar 2016 08:43:16 +0800
Tag:    v3.0.4

Merge branch 'MDL-53509-30' of git://github.com/andrewnicols/moodle into MOODLE_30_STABLE

commit 48d8bf0c0b5c600b54e6e22d258a80d8d0d940b3
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 14 Mar 2016 14:05:14 +0800
Tag:    v3.0.4

Merge branch 'MDL-53176-30' of git://github.com/merrill-oakland/moodle into MOODLE_30_STABLE