Merge branch 'MDL-56166-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Oct 2016 22:41:00 +0000 (00:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Oct 2016 22:41:00 +0000 (00:41 +0200)
commit8f900947e9bd9647298d634555deb315c88ea51d
tree1769497f473c1d1478eed2e6cbb5c8a8a1074d9e
parented66d725e6c3d254e0d620fdb35ad4ebf87c86ed
parentd1de864fab26b9957e46160a260365dc13491f0f
Merge branch 'MDL-56166-master' of git://github.com/FMCorz/moodle