Merge branch 'MDL-55725-master' of git://github.com/merrill-oakland/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Sep 2016 15:54:59 +0000 (17:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Sep 2016 15:54:59 +0000 (17:54 +0200)
commitfa7c2bd050dc0856f027efd160d14e9f0d512b4e
tree608ae35a7fb01a1ed8d8a01b9cd0e76c0f3cfe6d
parentb8c5fc862072c7380dc429474d04fae2b721c4d2
parent1aaead91f9df6a399d3112b7becb6de1cb302e63
Merge branch 'MDL-55725-master' of git://github.com/merrill-oakland/moodle