Merge branch 'MDL-49732_master' of https://github.com/jinhofer/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Jul 2015 17:18:19 +0000 (19:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Jul 2015 17:18:19 +0000 (19:18 +0200)
commit525dce0adea2919bf30455591cfcd907f37be014
tree1f2b671abbc727c1295f3cbf605072d467f26c53
parent17d47fa5aa673c2c35d31350be1f795bc234f342
parent36231b6cd5d21171156fbdf42be87757e48069bd
Merge branch 'MDL-49732_master' of https://github.com/jinhofer/moodle