Merge branch 'wip-MDL-50919-master' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Sep 2015 09:42:11 +0000 (11:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Sep 2015 09:42:11 +0000 (11:42 +0200)
commit544be5ad4d2b5d64e2a9eeba983eeede868cf155
treed5d88801d328570401c9b21f24a8a997e78c5876
parentb85e8b747c1ba26c6c350f3b55656f2033b9bb56
parentef4c23ccd28c5cea7c9cd573d8c52d16fbe3852c
Merge branch 'wip-MDL-50919-master' of https://github.com/marinaglancy/moodle