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