Merge branch 'wip-MDL-51802-fix' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 17 Feb 2016 16:29:07 +0000 (17:29 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 17 Feb 2016 16:29:07 +0000 (17:29 +0100)
commit83fe83e988c7d8f4e0107cb6060f927115592f03
tree2ed5927bca25c138e8737a5a322f3df3b7147f38
parent0b14d8612bdbef50797984913cb3cc9f885001ef
parentfa4dd0169da1fba8d1d4d0b016d1e886ed7c473c
Merge branch 'wip-MDL-51802-fix' of https://github.com/marinaglancy/moodle