Merge branch 'MDL-49901_master' of https://github.com/jinhofer/moodle
commit2426d816fea8014ea81ce311aa19d8978a44d04d
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Jun 2015 17:57:38 +0000 (2 19:57 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Jun 2015 17:57:38 +0000 (2 19:57 +0200)
tree81e03b0e8a8b9fb90043f77de17f124822d2b358
parent4bbb03583099c23c554d16576565a246f7e2f0b6
parent253db9dea75a5ea6edde8858fdf133ba0bd87236
Merge branch 'MDL-49901_master' of https://github.com/jinhofer/moodle