Merge branch 'MDL-50766_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Sep 2015 21:02:25 +0000 (23:02 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Sep 2015 21:02:25 +0000 (23:02 +0200)
commita16a3592f24789d0aac430052e94d67107b21468
treedcda71ea4aa63c94bd980efb863748b360b106c1
parent3c80f0166182f2093d60a618b1f96c1a7167c96c
parent8f76bfb62825602aa40b737248e615f1d68498d5
Merge branch 'MDL-50766_master' of git://github.com/dmonllao/moodle