Merge branch 'MDL-41922-master-c' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Jun 2016 09:23:09 +0000 (11:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Jun 2016 09:23:09 +0000 (11:23 +0200)
commit294c24253244fdc31f2f8d07a9f297c6b1f938be
tree33d6b745e89667536dabfe7c7e7081e45a56117f
parent4ee8ef5d4167afa00b21889a5fca3d39350ec2ef
parentac032e0e0961b162e0a31c7774aab31d7b3330cd
Merge branch 'MDL-41922-master-c' of git://github.com/FMCorz/moodle