Merge branch 'master' into backup-convert
authorDavid Mudrak <david@moodle.com>
Fri, 13 May 2011 01:16:13 +0000 (03:16 +0200)
committerDavid Mudrak <david@moodle.com>
Fri, 13 May 2011 01:16:13 +0000 (03:16 +0200)

Trivial merge