Merge branch 'MDL-48912' of git://github.com/jmvedrine/moodle
commit3d944d37dd59047c674c774850c9fd3ab057469c
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Mar 2015 18:30:00 +0000 (3 19:30 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Mar 2015 18:30:00 +0000 (3 19:30 +0100)
tree1201adef267af218e9a76418882d2f879866a96b
parente2d8685247285163c11b7de7d00616be9e51daf8
parent70206b2f722d6a02b3ff8736092f3df7aec39cc6
Merge branch 'MDL-48912' of git://github.com/jmvedrine/moodle