Merge branch 'MDL-55405-master' of git://github.com/cameron1729/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Sep 2016 10:21:37 +0000 (12:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Sep 2016 10:21:37 +0000 (12:21 +0200)
commit43f53ded83649ff8d59e983e534fd648c56bd037
tree116b54c0714809c1bb3e5b40b3462b94e0a045a5
parentce7863ba361b63446d471339a75521ce9a058204
parent4abbb4180b50bd1b363303ccd9e33fa05d70f34e
Merge branch 'MDL-55405-master' of git://github.com/cameron1729/moodle