Git merges in Moodle 1.9.11 by Sam Hemelryk

commit 490a1862696730acad780e830b156cdc654ce70c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Jan 2011 13:14:52 +0800
Tag:    v1.9.11

Merge branch 'm19_MDL-25320' of git://github.com/danmarsden/moodle into MOODLE_19_STABLE

commit 093f30a3fe531637ea5ecca361104b79396b99f2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jan 2011 13:52:23 +0800
Tag:    v1.9.11

Merge branch 'MDL-18839_19_wip' of git://github.com/skodak/moodle into MOODLE_19_STABLE

commit e7682e584a78f10cd48e9deb386974920febf1ae
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jan 2011 13:38:05 +0800
Tag:    v1.9.11

Merge branch 'MDL-25754_19_wip' of git://github.com/skodak/moodle into MOODLE_19_STABLE