Merge branch 'wip-MDL-57113-master' of https://github.com/kwiliarty/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Feb 2017 23:59:54 +0000 (00:59 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Feb 2017 23:59:54 +0000 (00:59 +0100)
commitac1837e6d6bc33a052b65220091c5471c2d4ca92
tree2d6d0ae8dce92f58451d051d6a9b89b86422289d
parent860b099f463f637c3ecdfff22c8fcbb60418b2a8
parent4274880b6aecf6da7dd2cf0fdd16d48ec588c93d
Merge branch 'wip-MDL-57113-master' of https://github.com/kwiliarty/moodle