Merge branch 'MDL-57846-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Feb 2017 23:12:30 +0000 (00:12 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Feb 2017 23:12:30 +0000 (00:12 +0100)
1  2 
lib/classes/external/exporter.php
lib/tests/exporter_test.php

Simple merge
Simple merge