Merge branch 'MDL-26037' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 5 Mar 2012 01:03:34 +0000 (14:03 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 5 Mar 2012 01:03:34 +0000 (14:03 +1300)
1  2 
backup/util/ui/renderer.php

Simple merge