Merge branch 'MDL-52014-master' of git://github.com/danpoltawski/moodle
commit2cc040c6c054521eb9683bb744ff6d147d784fc6
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Nov 2015 19:02:16 +0000 (2 20:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Nov 2015 19:02:16 +0000 (2 20:02 +0100)
tree225423bf1d8d598b3f10cd164970e52459412a1b
parente88100f67398047414e2cb85eee388290912b092
parent529405287555d989ef828d4b8b5fa7541dc13dfc
Merge branch 'MDL-52014-master' of git://github.com/danpoltawski/moodle