Merge branch 'MDL-51824-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Oct 2015 08:59:21 +0000 (09:59 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Oct 2015 08:59:21 +0000 (09:59 +0100)
commitf7d8c61ae75bba331ccf724d77989188272cc6c4
tree6632b0c96eafafaa153beaad0c416ec684a663d1
parent81c471e2a9eb576bce79a7badd558a4d342c0b5c
parent0bc41cfcecbdeb21ce5759b86e235802b6400971
Merge branch 'MDL-51824-master' of git://github.com/lameze/moodle