Merge branch 'wip-MDL-22955-m24' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Oct 2012 22:35:11 +0000 (00:35 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Oct 2012 22:35:11 +0000 (00:35 +0200)
commitdbaf9d448d7a50eeb0463131ed2d4e06f0841224
treee4cf13da5f1796b6e8a096bce2993482d35d45b9
parent49b1c61e5edba7dcc79a1c1d37f6687a659c17f0
parent27c1c305b1641d2410c32ee20227c647b927c874
Merge branch 'wip-MDL-22955-m24' of git://github.com/samhemelryk/moodle
admin/renderer.php
lib/filelib.php