Git merges in Moodle 2.4.5 by Marina Glancy

commit bebd6a6cef3701fbfbbfdf33c83d3ec8d95c37ee
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 13:39:55 +0800
Tag:    v2.4.5

Merge branch 'MDL-40207-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE


commit 272105604abe0098db0729dcb36b831f32cc81b1
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 12:13:10 +0800
Tag:    v2.4.5

Merge branch 'MDL-39650-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE


commit 2e6cc99352bb278f176ea1db0fd58ad938253feb
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 10:56:20 +0800
Tag:    v2.4.5

Merge branch 'MDL-40165-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE


commit af06f5def546ada7ed021b2af2858a7335d52c66
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 09:14:52 +0800
Tag:    v2.4.5

Merge branch 'MDL-38079_24' of git://github.com/mr-russ/moodle into MOODLE_24_STABLE


commit 351f4729e2f722488850deba39157f79e6aec877
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 11 Jun 2013 10:02:01 +0800
Tag:    v2.4.5

Merge branch 'MDL-39412_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE