Merge branch 'MDL-30243' of github.com:lazydaisy/moodle into MDL-30243
authorMary Evans <lazydaisy@visible-expression.co.uk>
Tue, 15 Nov 2011 22:21:05 +0000 (22:21 +0000)
committerMary Evans <lazydaisy@visible-expression.co.uk>
Tue, 15 Nov 2011 22:21:05 +0000 (22:21 +0000)

Trivial merge