Merge branch 'MDL-57319-32' of git://github.com/danpoltawski/moodle into MOODLE_32_STABLE
commit49612b733f6c410eb323a01ae3820df6a743be83
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Dec 2016 15:23:20 +0000 (12 16:23 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Dec 2016 15:23:20 +0000 (12 16:23 +0100)
tree28f3acb5b2821d09d91cb4d76f6bfaa7ab00c0cf
parentbc0721c7d9414f4b30bdf0324e5d8895e8a143ad
parent65de9774831d799b939c02afc88da6b0751b10da
Merge branch 'MDL-57319-32' of git://github.com/danpoltawski/moodle into MOODLE_32_STABLE