Merge branch 'MDL-50685_master' of git://github.com/dmonllao/moodle
commita4a972285e3d54b0eb9f9f273f94ae446d8e8a6e
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Sep 2015 00:15:51 +0000 (16 02:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Sep 2015 00:15:51 +0000 (16 02:15 +0200)
tree868300d9ccd404309b1ecba0e47ec54c1fa3c411
parent7bf83951f97d06c1deed21ef43eacf85a6f42400
parentec887caa4a7eaa608b46614fa310b8058a162c38
Merge branch 'MDL-50685_master' of git://github.com/dmonllao/moodle