Merge branch 'MDL-52938-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Feb 2016 23:30:02 +0000 (00:30 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Feb 2016 23:30:02 +0000 (00:30 +0100)
commitde0a98f8ef6a02f45b0ea7b6152d1dbeb5ebc5cd
tree8cca69c4067522ff0a2c9cb224dc78d64edf8288
parentf5e0cb117ae388f40e6d4d18ee9818845638371c
parente91a07f71b05f7d6f5d199b4e127eeddda3dfce2
Merge branch 'MDL-52938-master' of git://github.com/marinaglancy/moodle