Git merges in Moodle x.x.x by Mary Evans

commit 799cc1cfcb13b5a38e2dec7d15db4a82b9d9ca23
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Wed, 16 Nov 2011 06:21:05 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30243' of github.com:lazydaisy/moodle into MDL-30243