Merge branch 'MDL-55741' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Aug 2016 12:08:37 +0000 (14:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Aug 2016 12:08:37 +0000 (14:08 +0200)
commitb5776e1b9f113b9d1e8040f6509cf07574f13d23
tree8b7fa40773bfe0ce07ba3e0fbb1d811c46bb69f0
parentc2df528806efa9540685213b25e9c6f3f9e38845
parent972a367b983dcb38a65d84c101d7dcb4cbf773af
Merge branch 'MDL-55741' of git://github.com/timhunt/moodle