Merge branch 'MDL-54900-30' of git://github.com/marinaglancy/moodle into MOODLE_30_STABLE
commitc59c57a2da6d0b9f0abf82ca619811fbac9d4b97
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jun 2016 17:03:42 +0000 (27 19:03 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jun 2016 17:03:42 +0000 (27 19:03 +0200)
tree240c376f0d2025ff3f184169799ba46eb2192c6d
parent4070006db6690e4de597d0ea4e32f01351171aaa
parent371aae1e1ccb5493917716fe0edfaff18a51e7d2
Merge branch 'MDL-54900-30' of git://github.com/marinaglancy/moodle into MOODLE_30_STABLE