Merge branch 'MDL-38552-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Mar 2013 00:51:35 +0000 (01:51 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Mar 2013 00:51:35 +0000 (01:51 +0100)
commit49ef0c56efc1996e8971f9b806f6e69fdebf5774
tree684f106ed1819794de694ac505498490f9f318f7
parent381ffd46fc89c724828d4721298be465f0b47d9d
parentb7fc9d5a263a6a79ddf9dc80caecc4bc319770d5
Merge branch 'MDL-38552-master' of git://github.com/FMCorz/moodle