Merge branch 'wip-MDL-53638-master' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Apr 2016 12:24:59 +0000 (14:24 +0200)
committerDan Poltawski <dan@moodle.com>
Fri, 29 Apr 2016 11:17:52 +0000 (12:17 +0100)
commit28ee220a368a0a18e85026d4075de2092d0ddb50
treedaafd9b37ec0ebc2a4e825e13845b04a55575afd
parent861de101a9c9aba547eae4cec4142560ceb158d7
parent0a0632cee65582daaafed4664749a3a0ee8f3c4d
Merge branch 'wip-MDL-53638-master' of https://github.com/marinaglancy/moodle