Merge branch 'wip-MDL-53443-master' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 13 Apr 2016 01:26:46 +0000 (03:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 13 Apr 2016 01:26:46 +0000 (03:26 +0200)
commit1d981ae4c214c0f7ac9a9ff881fbced36257cfb1
tree4dfdae86e788c5156d5ee0f1ba38babe6a0dec55
parentf40b444ef8fad68c7b85879ec24cee0e42e5e73a
parentdf003a85f0a39a9fb520a7542f9047eeeb12e349
Merge branch 'wip-MDL-53443-master' of https://github.com/marinaglancy/moodle