Merge branch 'MDL-55874-master' of git://github.com/danpoltawski/moodle
commit9d821b6faf32c46861891618f746f67118761a35
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Sep 2016 16:29:42 +0000 (12 18:29 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Sep 2016 16:29:42 +0000 (12 18:29 +0200)
tree8aab168d328174e6688733484943ad125b946f9e
parentfa7c2bd050dc0856f027efd160d14e9f0d512b4e
parentd6713a430e3854e3dcf4fc40f74342902e7f042d
Merge branch 'MDL-55874-master' of git://github.com/danpoltawski/moodle