Git merges in Moodle 2.0.9 by Dan Poltawski

commit 7f8e21310bb5ce0d2fae54aad55f938468d2fc2c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 May 2012 12:40:52 +0800
Tag:    v2.0.9

Merge branch 'w19_MDL-31691_m20_cohortidnumber' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit d4359bed487a9073da1fd14ca1c2f6a089f2a6d6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 May 2012 12:36:17 +0800
Tag:    v2.0.9

Merge branch 'MDL-32718-sql-typo_20' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit 29cbfe7838bc57eb83f5d8977eb164a2af96f5e9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 May 2012 15:32:46 +0800
Tag:    v2.0.9

Merge branch 'MDL-18335_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE

commit 2ffdfadb8c98a5969f5e2f3d298184ef7d7b712e
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 19 Apr 2012 17:40:11 +0800
Tag:    v2.0.9

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE