Git merges in Moodle 1.9.15 by Sam Hemelryk

commit 01c33e8a01f34db1aeba24590d590aa43347a9ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 04:37:18 +0800
Tag:    v1.9.15

Merge branch 'w43_MDL-29925_m19_calendar' of git://github.com/skodak/moodle into MOODLE_19_STABLE

commit 37e289a131e0db4e235938a614f012ec86c6e1c4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Oct 2011 06:11:57 +0800
Tag:    v1.9.15

Merge branch 'MDL-29697-Fix_incorrect_error_msg' of https://github.com/ncsu-delta/moodle into MOODLE_19_STABLE

commit 0aff48f3a44ef6bab12fb1b70d575503f6532531
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 13:51:08 +0800
Tag:    v1.9.15

Merge branch 'MDL-28170_19' of git://github.com/stronk7/moodle into MOODLE_19_STABLE

commit e1b4fa3029e90af3ef75102bedd6c5a1e1be618f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 12:57:41 +0800
Tag:    v1.9.15

Merge branch 'MDL-16553-19' of git://github.com/bostelm/moodle into MOODLE_19_STABLE

commit d2a5725cd55ed8a312f4787151f43f4046fb1c3d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 07:18:08 +0800
Tag:    v1.9.15

Merge branch 'MDL-23047-Add_missing_log' of https://github.com/ncsu-delta/moodle into MOODLE_19_STABLE