Merge branch 'MDL-44840-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Aug 2015 18:46:59 +0000 (20:46 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Aug 2015 18:46:59 +0000 (20:46 +0200)
commit6d2ccd352f425e0f6d1a53689fcdc82e122e117f
treeca0620369769800f0c481a298eea01e04d342672
parent72d3fd103599dcff40504cfd1e7f7c241b8fe5c8
parent239e9eb8f6cd4d16ed8a7173b47bbcc336b5c607
Merge branch 'MDL-44840-master' of git://github.com/lameze/moodle