Merge branch 'master' into install_master
authorAMOS bot <amos@moodle.org>
Sat, 24 Aug 2013 00:58:58 +0000 (00:58 +0000)
committerAMOS bot <amos@moodle.org>
Sat, 24 Aug 2013 00:58:58 +0000 (00:58 +0000)

Trivial merge