Merge branch 'MDL-57592-master' of https://github.com/mwehr/moodle
commit326cd6f661852fc4c4ffd2f304c6ff32d84a9f08
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Jan 2017 16:27:39 +0000 (31 17:27 +0100)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 1 Feb 2017 05:01:27 +0000 (1 13:01 +0800)
treedd165733f8f1acd03901299aa83a7c5a910b0628
parent326efc7c66f1d06c2512b01256ba227a54056e69
parentf58861051f7d7eae9e7dfaf230bc5e6bc0994415
Merge branch 'MDL-57592-master' of https://github.com/mwehr/moodle