Merge branch 'MDL-34945-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Sep 2012 18:11:53 +0000 (20:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Sep 2012 18:11:53 +0000 (20:11 +0200)
1  2 
repository/lib.php
repository/manage_instances.php

Simple merge
Simple merge