Merge branch 'MDL-50816-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Aug 2015 16:20:52 +0000 (18:20 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Aug 2015 16:20:52 +0000 (18:20 +0200)
commit72d3fd103599dcff40504cfd1e7f7c241b8fe5c8
treecd816abf45a43f94c106cfb3e1e3cf97303ca9e5
parentaa29bb3ba0f0ab6dac15cdcb09f40d9b3809497c
parent6166a9fbe707f353f7a9ceebb4d97c12f13a051a
Merge branch 'MDL-50816-master' of git://github.com/jleyva/moodle