Git merges in Moodle 2.7.4 by Andrew Nicols

commit d1600276944d99ba457a4c67f293c64956ada4bd
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 07 Jan 2015 12:14:49 +0800
Tag:    v2.7.4

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

commit 39e53d30acfe71c186d8fe445ef0b78a05f4f71a
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 06 Jan 2015 11:54:25 +0800
Tag:    v2.7.4

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

commit c22c31c5c700d8ac1c491509e0ab38e884a0ee54
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 06 Jan 2015 10:54:39 +0800
Tag:    v2.7.4

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

commit 16e8cdf026f7ed31a728e3372c21655fe1268e93
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 06 Jan 2015 10:38:16 +0800
Tag:    v2.7.4

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

commit 7f722404af91aa71c770fa29244c1e0df4616c88
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 05 Jan 2015 16:18:46 +0800
Tag:    v2.7.4

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

commit 0b3ae207008d5c74f1dfa899af60c867e9e7c0ae
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 05 Jan 2015 14:33:04 +0800
Tag:    v2.7.4

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

commit d4b5a097a200b981ed69c71b2511146c66d4c3a0
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 05 Jan 2015 13:58:45 +0800
Tag:    v2.7.4

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

commit 5a7eccbb65b684e028920b66e162a0a4560890ef
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 05 Jan 2015 13:42:06 +0800
Tag:    v2.7.4

Merge branch 'wip-MDL-40097-27' of git://github.com/abgreeve/moodle into MOODLE_27_STABLE

commit af44f812421f8a7f922ab1210c8121e758d49db0
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 16 Dec 2014 10:40:31 +0800
Tag:    v2.7.4

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