Merge branch 'master' into install_master
authorAMOS bot <amos@moodle.org>
Sat, 14 Sep 2013 00:41:33 +0000 (00:41 +0000)
committerAMOS bot <amos@moodle.org>
Sat, 14 Sep 2013 00:41:33 +0000 (00:41 +0000)

Trivial merge