Merge branch 'wip-MDL-35891-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 8 Jan 2013 20:41:00 +0000 (09:41 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 Jan 2013 20:41:00 +0000 (09:41 +1300)
1  2 
files/renderer.php
lang/en/repository.php

Simple merge
Simple merge