Git merges in Moodle 2.8.4 by Dan Poltawski

commit 9db4890064b05dc543d0308a84818e6a4ad4efcc
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Mar 2015 22:46:34 +0800
Tag:    v2.8.4

Merge branch 'MDL-49335_28' of git://github.com/timhunt/moodle into MOODLE_28_STABLE

commit c6e925dbf0a4f071445a90dccd4a3af805427310
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Mar 2015 21:25:33 +0800
Tag:    v2.8.4

Merge branch 'MDL-49334_28' of git://github.com/timhunt/moodle into MOODLE_28_STABLE

commit 35a615aa339714aecbb82039bd0b10c15f83994b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Mar 2015 21:21:30 +0800
Tag:    v2.8.4

Merge branch 'MDL-47000-28' of git://github.com/merrill-oakland/moodle into MOODLE_28_STABLE

commit 84fd0fd52cc8bad89819e1b1a72c7b0ddac1cfc4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Mar 2015 19:03:12 +0800
Tag:    v2.8.4

Merge branch 'MDL-34006_m28v7' of https://github.com/sbourget/moodle into MOODLE_28_STABLE

commit e527aff4d251fc74ce0a917b9a1d7516e3a49708
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Mar 2015 16:34:50 +0800
Tag:    v2.8.4

Merge branch 'MDL-49160-28' of git://github.com/merrill-oakland/moodle into MOODLE_28_STABLE

commit f479a30931488f5fa9bfa40ec2ed3748061854de
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Mar 2015 01:27:15 +0800
Tag:    v2.8.4

Merge branch 'MOODLE_28_STABLE' of https://github.com/mitstek/moodle into MOODLE_28_STABLE

commit a62cc33c1f168ce0a3efc46455a7d9bb41858844
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Mar 2015 00:57:54 +0800
Tag:    v2.8.4

Merge branch '28_MDL-49303' of https://github.com/danmarsden/moodle into MOODLE_28_STABLE

commit 0dedf765e0b2e907d774dde99b37fd5fbca47493
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Mar 2015 19:06:19 +0800
Tag:    v2.8.4

Merge branch 'MDL-47911-28' of git://github.com/damyon/moodle into MOODLE_28_STABLE

commit 952bc6c5a6a32ec68f7920fbb9e12822580dd2cf
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Mar 2015 17:34:57 +0800
Tag:    v2.8.4

Merge branch 'MDL-23273-28' of git://github.com/zbdd/moodle into MOODLE_28_STABLE

commit 6fe7343a943b8ba94a268b7ffc5744131c4985fe
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 25 Feb 2015 22:57:36 +0800
Tag:    v2.8.4

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

commit 84be895b9406d894c128e2eda39d8609abcea4ea
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 25 Feb 2015 00:50:15 +0800
Tag:    v2.8.4

Merge branch 'MDL-49241-28-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_28_STABLE

commit 8732862bb589fb54fd2a71b837543b27f1a00875
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 24 Feb 2015 18:43:32 +0800
Tag:    v2.8.4

Merge branch 'wip_MDL-49184_m28_choice' of https://github.com/skodak/moodle into MOODLE_28_STABLE

commit 40b53bda8c4567fb1462f89fe0c64a30895483b5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 24 Feb 2015 16:31:54 +0800
Tag:    v2.8.4

Merge branch 'MDL-49216-28' of git://github.com/andrewnicols/moodle into MOODLE_28_STABLE

commit 105e1af0101544239a781abb261a9520b4a9170b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 24 Feb 2015 00:29:25 +0800
Tag:    v2.8.4

Merge branch 'MDL-49198_m28' of https://github.com/markn86/moodle into MOODLE_28_STABLE

commit 06b5e1f1e1b9b7843e2b8f6991ea33a0a4d986b3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 24 Feb 2015 00:21:33 +0800
Tag:    v2.8.4

Merge branch 'MDL-49200_m28' of https://github.com/markn86/moodle into MOODLE_28_STABLE

commit 9c2e581e82f9325ceb9ac3122c6b56f0003df7ee
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Feb 2015 23:55:37 +0800
Tag:    v2.8.4

Merge branch 'MOODLE_28_STABLE' of https://github.com/eberhardt/moodle into MOODLE_28_STABLE

commit f4241a59742f7e1db9f6cdb1845ad46189828ceb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Feb 2015 17:17:58 +0800
Tag:    v2.8.4

Merge branch 'wip-mdl-49081-m28' of https://github.com/rajeshtaneja/moodle into MOODLE_28_STABLE

commit fa75bb63e35b453f971058338abc7879b9dac685
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Feb 2015 06:42:14 +0800
Tag:    v2.8.4

Merge branch 'MDL-48544-28' of git://github.com/andrewnicols/moodle into MOODLE_28_STABLE

commit a1504fd7bce8d0595b6532be9f69bf4f69371bc5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Feb 2015 22:50:37 +0800
Tag:    v2.8.4

Merge branch 'wip-MDL-47558-m28' of git://github.com/marinaglancy/moodle into MOODLE_28_STABLE

commit 65610151658e024c56bab5564a05c83fc01307b7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Feb 2015 19:33:14 +0800
Tag:    v2.8.4

Merge branch 'MDL-44520-28' of git://github.com/xow/moodle into MOODLE_28_STABLE

commit 69d4a9b94f9d230f82317d56de4739318339cc3d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Feb 2015 19:28:21 +0800
Tag:    v2.8.4

Merge branch 'MDL-48294-28' of git://github.com/jleyva/moodle into MOODLE_28_STABLE

commit de90103193193b3a73a8b7c044e14ca972381c80
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Feb 2015 18:29:19 +0800
Tag:    v2.8.4

Merge branch 'MDL_47085_28' of https://github.com/totara/openbadges into MOODLE_28_STABLE

commit e470238304e9a3735d6db540dd8c6a591e675454
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Feb 2015 18:21:42 +0800
Tag:    v2.8.4

Merge branch 'MDL-47953-28' of git://github.com/FMCorz/moodle into MOODLE_28_STABLE

commit 354e304f290c1efee7fee0c3f3690cfa37daabb1
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 05 Feb 2015 18:07:20 +0800
Tag:    v2.8.4

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

commit 7606f81a88060a523a377ae2f7cada78f6b6543b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Feb 2015 23:55:24 +0800
Tag:    v2.8.4

Merge branch 'MDL-48942_survey_28' of https://github.com/andyjdavis/moodle into MOODLE_28_STABLE

commit abb61b1a65afa312f050437185a89d59ed009f84
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Feb 2015 22:04:37 +0800
Tag:    v2.8.4

Merge branch 'MDL-48955-28' of https://github.com/vadimonus/moodle into MOODLE_28_STABLE

commit 14caa61bd4933133897cec661c250f5c7edb1869
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Feb 2015 21:16:53 +0800
Tag:    v2.8.4

Merge branch 'wip-mdl-49002-m28' of https://github.com/rajeshtaneja/moodle into MOODLE_28_STABLE

commit 45acb77a3f178a5850ed2d71f23dafb9061baf7a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Feb 2015 21:13:25 +0800
Tag:    v2.8.4

Merge branch 'm28_MDL-48799_Incorrect_Legacy_Dir_Fallback' of https://github.com/scara/moodle into MOODLE_28_STABLE

commit 9e98e66cb23e9ecf4b0f8df081ba1d284bc685ba
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Feb 2015 20:56:44 +0800
Tag:    v2.8.4

Merge branch 'm28_MDL-48907' of https://github.com/totara/moodle into MOODLE_28_STABLE

commit 8bde10311899ca3842b32e10801dc95aca13252f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Feb 2015 20:17:20 +0800
Tag:    v2.8.4

Merge branch 'MDL-44071-28' of git://github.com/zbdd/moodle into MOODLE_28_STABLE

commit ed67b6fb061a30ff3a2ee304dcc76cc35e1ec789
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Feb 2015 19:13:50 +0800
Tag:    v2.8.4

Merge branch 'MDL-48533_m28' of https://github.com/markn86/moodle into MOODLE_28_STABLE

commit 8bca20b7ecc4ade91cfc5b424cb9818f994b97b2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Feb 2015 19:01:57 +0800
Tag:    v2.8.4

Merge branch 'wip-mdl-48624-m28' of https://github.com/rajeshtaneja/moodle into MOODLE_28_STABLE