Merge branch 'w23_MDL-30725_m23_backuptrash' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Jun 2012 23:43:40 +0000 (01:43 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Jun 2012 23:43:40 +0000 (01:43 +0200)

Trivial merge