Git merges in Moodle x.x.x by Tim Hunt

commit 54771d89d1571ae8521a3565f87c5ed1623565b0
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Tue, 07 Jun 2011 00:14:59 +0800
Tag:    v2.1.0

Merge remote-tracking branch 'moodle/master' into MDL-20636_master_new_question_engine

commit a2ac23495656d62cf4c203be72f3ff2423b2ca8a
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Thu, 12 May 2011 03:29:49 +0800
Tag:    v2.1.0

MDL-20636 Merge remote-tracking branch 'moodle/master' into upgrade

commit e2cba246b724efe1ef72bc98d70b92e37999a0be
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Thu, 03 Mar 2011 01:34:18 +0800
Tag:    v2.1.0

MDL-20636 Merge vle/master into ouqe2

commit 74c479f212894edc81ee49e34248c1cdbe1c229a
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Thu, 03 Feb 2011 19:07:11 +0800
Tag:    v2.1.0

MDL-20636 Merge branch 'master' into qe2_wip