Git merges in Moodle 2.7.1 by Damyon Wiese

commit c5f351435e0b7fc13540a66e29161521851417ec
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 10 Jul 2014 09:58:44 +0800
Tag:    v2.7.1

Merge branch 'MDL-19270_moodle27stable' of https://github.com/nadavkav/moodle into MOODLE_27_STABLE

commit 1e4e4a05d7c7ff13584ee326e714258363e0a7b2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 24 Jun 2014 16:59:42 +0800
Tag:    v2.7.1

Merge branch 'MDL-45652_m27' of https://github.com/markn86/moodle into MOODLE_27_STABLE

commit 9dc96087950694e358fa4510c7d7c6b24d7c8fea
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 24 Jun 2014 16:03:53 +0800
Tag:    v2.7.1

Merge branch 'MDL-10115-27' of git://github.com/xow/moodle into MOODLE_27_STABLE

commit cc5f8bd53fc77c0a7a3c14cdc499acb1f32eba82
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 24 Jun 2014 13:10:52 +0800
Tag:    v2.7.1

Merge branch 'wip-MDL-46038-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE

commit bb512f7c1f7ca8d9fa363b596df6dd2d798ec897
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 24 Jun 2014 13:08:17 +0800
Tag:    v2.7.1

Merge branch 'MDL-46035_survey_27' of https://github.com/andyjdavis/moodle into MOODLE_27_STABLE

commit 5b5a73019dff3ca894ec11129df02eda23cdb2ee
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 24 Jun 2014 11:48:02 +0800
Tag:    v2.7.1

Merge branch 'MDL-46046-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit ce0b9bb7ca74d26d127d17a2bff1bc9d7af1d4f6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 24 Jun 2014 11:35:21 +0800
Tag:    v2.7.1

Merge branch 'MDL-46056-27' of git://github.com/mudrd8mz/moodle into MOODLE_27_STABLE

commit 38063e7d1b66581cdc2fe3fe6ee48d11f00b0ea1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 24 Jun 2014 10:58:17 +0800
Tag:    v2.7.1

Merge branch 'MDL-44512-27' of git://github.com/jethac/moodle into MOODLE_27_STABLE

commit ee5b9e137dca1d6a70221e32e69a1c722dc41d62
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 24 Jun 2014 10:19:16 +0800
Tag:    v2.7.1

Merge branch 'MDL-44773-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit 3352ffcfa2df4e9efdb2f52337ddd33cb72d9a3b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 23 Jun 2014 15:20:14 +0800
Tag:    v2.7.1

Merge branch 'MDL-45580-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit 80b81e5094bd6287a6afe7d27eb58193ced74fae
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 23 Jun 2014 14:39:56 +0800
Tag:    v2.7.1

Merge branch '37145-27' of git://github.com/samhemelryk/moodle into MOODLE_27_STABLE

commit 6e977fcdd63e706f8d1abde7b5c1705862d735d0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 23 Jun 2014 14:15:36 +0800
Tag:    v2.7.1

Merge branch 'MDL-38693-27' of git://github.com/jethac/moodle into MOODLE_27_STABLE

commit 9134f3f0dfc54a53d90e4225d4996b854a981611
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 23 Jun 2014 12:30:41 +0800
Tag:    v2.7.1

Merge branch 'MDL-35453_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit b093752289a4b58f2c11e0de6ba4328626a64b51
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 23 Jun 2014 12:26:31 +0800
Tag:    v2.7.1

Merge branch 'MDL-46086_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit cefe7c7f5967ae56fe94966ccf0e4b716d9be8a9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 19 Jun 2014 14:13:20 +0800
Tag:    v2.7.1

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

commit 49703ecf1d012e02715e6d37b3d78217d79c417c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 17 Jun 2014 10:17:55 +0800
Tag:    v2.7.1

Merge branch 'm27_MDL-45582' of git://github.com/greg-or/moodle-mod_assign into MOODLE_27_STABLE

commit 6e10f195c5cac32b96f030a9ccec755cef5f8a59
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 16 Jun 2014 14:29:51 +0800
Tag:    v2.7.1

Merge branch 'm27_MDL-45582' of git://github.com/greg-or/moodle-mod_assign into MOODLE_27_STABLE

commit b3b4f9a4a4bc7bc175e3420641f8ddef6f76b70b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 16 Jun 2014 12:07:40 +0800
Tag:    v2.7.1

Merge branch 'MDL-31998_27' of git://github.com/grabs/moodle into MOODLE_27_STABLE

commit 1742e767774bf03551a99d7238fba489bf8fdbb1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 16 Jun 2014 11:13:45 +0800
Tag:    v2.7.1

Merge branch 'wip-mdl-46001-m27' of https://github.com/rajeshtaneja/moodle into MOODLE_27_STABLE

commit 2538e2dab18024730717813b1d149483fb52c607
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 16 Jun 2014 11:01:04 +0800
Tag:    v2.7.1

Merge branch 'MDL-45803_m27' of https://github.com/markn86/moodle into MOODLE_27_STABLE

commit 5468d02e607df6d1e1bb65756e283600496a3620
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Jun 2014 15:31:00 +0800
Tag:    v2.7.1

Merge branch '45524-27' of git://github.com/samhemelryk/moodle into MOODLE_27_STABLE

commit ecd99dc88a02c495ae781815dd4d4675a7043fc9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Jun 2014 14:08:03 +0800
Tag:    v2.7.1

Merge branch 'wip-mdl-44309-m27' of https://github.com/deraadt/moodle into MOODLE_27_STABLE

commit 3097fca71cf1668b16363ef9545e68ee0217eb6b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Jun 2014 14:00:58 +0800
Tag:    v2.7.1

Merge branch 'MDL-45761-27' of https://github.com/merrill-oakland/moodle into MOODLE_27_STABLE

commit bc1c896692a8f7ad1a8c288623221fc750bef9da
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Jun 2014 13:53:43 +0800
Tag:    v2.7.1

Merge branch 'MDL-45767_returnInstanceid_27' of https://github.com/moodlerooms/moodle into MOODLE_27_STABLE

commit 6a927661f2f2b176804e08e076362924b27e61e2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Jun 2014 13:12:07 +0800
Tag:    v2.7.1

Merge branch 'MDL-45763-27' of https://github.com/merrill-oakland/moodle into MOODLE_27_STABLE

commit 11be1e8b2bff990b2efa60de13b4588ba57dac87
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 09 Jun 2014 12:43:27 +0800
Tag:    v2.7.1

Merge branch 'MDL-39726-27' of https://github.com/merrill-oakland/moodle into MOODLE_27_STABLE

commit 8fde6e8ef9237fd4b9575a83cd1f51095804a6f9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 09 Jun 2014 08:56:00 +0800
Tag:    v2.7.1

Merge branch 'MDL-45714-27' of https://github.com/merrill-oakland/moodle into MOODLE_27_STABLE

commit 9fbdee633ac844303efe0efd34c675d9f89bf021
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 04 Jun 2014 10:20:15 +0800
Tag:    v2.7.1

Merge branch 'MDL-45568_m27' of git://github.com/markn86/moodle into MOODLE_27_STABLE

commit 4affd3c42ed71ca660dc69c5f1c122f26bd642b4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Jun 2014 16:14:56 +0800
Tag:    v2.7.1

Merge branch 'MDL-45592_27' of git://github.com/grabs/moodle into MOODLE_27_STABLE

commit 8771f49c0a226a1f769c54086f42f0656789612a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Jun 2014 14:38:57 +0800
Tag:    v2.7.1

Merge branch 'MDL-45677_m27' of https://github.com/markn86/moodle into MOODLE_27_STABLE

commit b018b44b49f921f888923e3cc8b0eff0621af4d9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Jun 2014 12:49:59 +0800
Tag:    v2.7.1

Merge branch 'm27_MDL-44098' of git://github.com/greg-or/moodle-mod_assign into MOODLE_27_STABLE

commit 07783f9c2064394d497c823426c3ea8000185569
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Jun 2014 11:57:54 +0800
Tag:    v2.7.1

Merge branch 'MDL-45781_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit db52d4058df2e846ec96da076240b31b687e6ef3
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 26 May 2014 12:11:39 +0800
Tag:    v2.7.1

Merge branch '45499-27' of git://github.com/samhemelryk/moodle into MOODLE_27_STABLE

commit 740cb942ce2681e033be44e758639daec2ef7328
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 May 2014 13:30:51 +0800
Tag:    v2.7.1

Merge branch 'master_MDL-45583' of github.com:danmarsden/moodle into MOODLE_27_STABLE

commit 3725adf852882fd698f62505ea791bccf882cae4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 May 2014 13:28:09 +0800
Tag:    v2.7.1

Merge branch 'MDL-45323-master' of git://github.com/lameze/moodle into MOODLE_27_STABLE

commit d0f43772fb1f46df43f0670452d40019f5883420
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 May 2014 13:12:16 +0800
Tag:    v2.7.1

Merge branch 'MDL-45476-master' of git://github.com/phalacee/moodle into MOODLE_27_STABLE

commit 1d8bebfeafed1afd1c2992b257f19316ebfb374c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 May 2014 09:00:35 +0800
Tag:    v2.7.1

Merge branch '44974-27' of git://github.com/samhemelryk/moodle into MOODLE_27_STABLE

commit bb5652829fb18cf0b341d80fa91a52f02e38313d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 May 2014 21:27:47 +0800
Tag:    v2.7.1

Merge branch 'MDL-45130-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit 288a79ccd450722875197a246d0c546b275863e9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 May 2014 20:47:27 +0800
Tag:    v2.7.1

Merge branch 'MDL-45472-master' of git://github.com/andrewnicols/moodle into MOODLE_27_STABLE

commit 8f6d8a565302a577a4cabc220b0fd1ea54c28d78
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 May 2014 20:23:09 +0800
Tag:    v2.7.1

Merge branch 'MDL-45447-master' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit 177beaf23a210fd49d1688ced50cc35f24c69c8f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 May 2014 20:05:25 +0800
Tag:    v2.7.1

Merge branch 'MDL-45527-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit 91fae7e9b4b3ad90a4f7f95df91e72935d51938d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 May 2014 13:00:00 +0800
Tag:    v2.7.1

Merge branch 'MDL-32543' of https://github.com/danielneis/moodle into MOODLE_27_STABLE

commit 3e7b9158f45cd82539cbaa44789ab3487ab694d6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 May 2014 12:44:31 +0800
Tag:    v2.7.1

Merge branch 'MDL-23566' of https://github.com/aolley/moodle into MOODLE_27_STABLE

commit 3724b3aa8d73cff426132e529fc4678d0dab0160
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 May 2014 12:28:10 +0800
Tag:    v2.7.1

Merge branch 'MDL-45533-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit 9af90f03bba8df2c48a2c3bfb615fbba8e162225
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 May 2014 12:14:42 +0800
Tag:    v2.7.1

Merge branch 'MDL-44634-27' of https://github.com/dbezborodovrp/moodle into MOODLE_27_STABLE

commit 1c48d7e188f356569246e374beb92cf1005a3d63
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 13 May 2014 16:01:50 +0800
Tag:    v2.7.1

Merge branch 'MDL-41383-27' of git://github.com/jethac/moodle into MOODLE_27_STABLE