Merge branch 'MDL-53669_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Apr 2016 20:02:02 +0000 (22:02 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Apr 2016 20:02:02 +0000 (22:02 +0200)
commit68f009dfb320ca75894c6f91cb62c30819fa9760
treebec20d1f6df87ef594e9f61a6540757ddbbdb073
parent1183dfa0f73b7efbad0968e170a00c9f4025d4ca
parent4981d06daef64e4ddfb75269344ef6933e7ceacc
Merge branch 'MDL-53669_master' of git://github.com/markn86/moodle