Merge branch 'cvshead' of /git/import/moodle into cvshead
authorMoodle HQ git importer <gitimport@server2.moodle.com>
Thu, 17 Dec 2009 05:38:06 +0000 (13:38 +0800)
committerMoodle HQ git importer <gitimport@server2.moodle.com>
Thu, 17 Dec 2009 05:38:06 +0000 (13:38 +0800)

Trivial merge