Eloy Lafuente (stronk7) d2142e7b7c Merge branch '23538-29' of git://github.com/samhemelryk/moodle
Conflicts:
	backup/util/ui/renderer.php
2014-11-25 17:00:06 +01:00
..