Merge branch 'MDL-55804_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Sep 2016 23:14:33 +0000 (01:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Sep 2016 23:14:33 +0000 (01:14 +0200)
commitd0deb28c242930369afd29a5d308f2d17460818a
treeb6da2fcace5305c813c008c07a0b8f74e97b3a41
parent71ee1636647a62c6bad78cb2c7e5abe35b9ee38a
parentf258a958a418457dfda0cd5ef35ad086bc8b0434
Merge branch 'MDL-55804_master' of git://github.com/dmonllao/moodle