Merge branch 'MDL-50176' of git://github.com/aolley/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Jun 2015 18:28:36 +0000 (20:28 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Jun 2015 18:28:36 +0000 (20:28 +0200)
commitb3b6dc9d66179c18f6d5c1e1e105fc714b46384b
tree0880b8e0b816b10fa740cb6afbae438449928e51
parentcc9806146d0bfbc6666e519922f64a1940a6ff00
parentb8264f5b2b381a34a27596dd63d6a94c0b4ee41c
Merge branch 'MDL-50176' of git://github.com/aolley/moodle