Merge branch 'MDL-52887-30' of git://github.com/marinaglancy/moodle into MOODLE_30_STABLE
commit4070006db6690e4de597d0ea4e32f01351171aaa
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jun 2016 14:13:45 +0000 (27 16:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jun 2016 14:13:45 +0000 (27 16:13 +0200)
tree1672540a6e551ead5b617a3d44a9be2b68c29eee
parent80c47141a12ed99f423a28be542ee192c4f5f1b4
parentf5fe07de0ca3decabde5d6b3b32995ef9ef9ab8f
Merge branch 'MDL-52887-30' of git://github.com/marinaglancy/moodle into MOODLE_30_STABLE