Merge branch 'MDL-40566_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Sep 2013 18:38:53 +0000 (20:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Sep 2013 18:38:53 +0000 (20:38 +0200)
commit58c80b03a85ef64e041f9784e1a37cd00949e6ef
tree06bc56035a34bd3248df6b2215c551c910ec9c5b
parentf82a082ae2609d3e45fe0546ec20bd93e095e203
parentfcc0b5b9206e3df2f90776673e5f828e0ffe2cef
Merge branch 'MDL-40566_master' of git://github.com/dmonllao/moodle