Merge branch 'MDL-8307-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Sep 2012 09:33:24 +0000 (11:33 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Sep 2012 09:33:24 +0000 (11:33 +0200)
commitdafc3b7a85a49eca5dd936354f320e8c642f1bd6
tree47f2c3c57c523264450cf57fe5b91f5c74696e4a
parent8e35be43c44f4edb9959e7e60bbff49e157ce385
parentd347f30474bea6ae64f79d67e42aaf1091bcd623
Merge branch 'MDL-8307-master' of git://github.com/FMCorz/moodle