Merge branch 'MDL-35870' of git://github.com/nobelium/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Jul 2014 16:30:29 +0000 (18:30 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Jul 2014 16:30:29 +0000 (18:30 +0200)
commitc5e073556952b35562637794193b33548bce334e
tree7a3e244bfa2468d0d97b43af34fd464853219d12
parent6a91c41a49eb6676a519a798dc5c6e855a0aa934
parent76c8fa4190594b362d467fc138f7741be72bfb1d
Merge branch 'MDL-35870' of git://github.com/nobelium/moodle