Merge branch 'MDL-51292-master' of git://github.com/cameron1729/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 30 Sep 2015 15:32:57 +0000 (17:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 30 Sep 2015 15:32:57 +0000 (17:32 +0200)
commit880eb93d3f1ef7a7fd634ed7b9b1ca81231fa0da
tree7ae857acd925050224b106d6c59a5a9a9d1a02cf
parent161649644d440ea42f8b56d8beeeb8eebb57c899
parent584dd1b35dda81669a21b06c95f76e6338811748
Merge branch 'MDL-51292-master' of git://github.com/cameron1729/moodle