Merge branch 'MDL-54997-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jun 2016 18:22:14 +0000 (20:22 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jun 2016 18:22:14 +0000 (20:22 +0200)
commitf8ca380b474dd7bea66b8a010e939affbe058a0c
tree774e286996568d5d049c1636d3907fffe870f6e7
parent74eb5bb9feb0f4243b2d7bb1eeca5fafc84c6ed0
parente824cd502d4b82b64ebeedf07bf311ebd9081f34
Merge branch 'MDL-54997-master' of git://github.com/damyon/moodle