Merge branch 'MDL-49882' of git://github.com/jmvedrine/moodle
commit22214c22d13fde9fe554f10b3a36060eac779e08
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Jun 2015 23:39:17 +0000 (10 01:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Jun 2015 23:39:17 +0000 (10 01:39 +0200)
tree013665327c27c4c4e71852db1648f4d023be0373
parent28ddf1e94d030afaaf98e0f75cd6c34030d135e2
parent5d33ec9c7e3384bc0f89c7d6bab725466119652e
Merge branch 'MDL-49882' of git://github.com/jmvedrine/moodle