Git merges in Moodle 2.1.8 by Dan Poltawski

commit 5b6f73f48825508939f5f2c9d68adfec22e85fa5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Jul 2012 14:05:38 +0800
Tag:    v2.1.8

Merge branch 'MDL-34507-21' of git://github.com/FMCorz/moodle into MOODLE_21_STABLE


commit e60c472ccb6522fb98920a7c1758e55baffc681a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Jul 2012 11:58:13 +0800
Tag:    v2.1.8

Merge branch 'MDL-34519_21_course_reset_patch' of git://github.com/rlorenzo/moodle into MOODLE_21_STABLE


commit af08d144c935cb11411a89620273d3869883cd8d
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 19 Jul 2012 13:42:39 +0800
Tag:    v2.1.8

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE


commit aea7288f7737661881c8f6a272c9ab299de47303
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 12 Jul 2012 15:50:50 +0800
Tag:    v2.1.8

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE