Merge branch 'master' into install_master
authorAMOS bot <amos@moodle.org>
Sat, 19 Nov 2011 00:30:59 +0000 (00:30 +0000)
committerAMOS bot <amos@moodle.org>
Sat, 19 Nov 2011 00:30:59 +0000 (00:30 +0000)

Trivial merge