Merge branch 'wip-MDL-34290-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Aug 2012 10:11:00 +0000 (12:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Aug 2012 10:11:00 +0000 (12:11 +0200)
1  2 
repository/lib.php
repository/repository_ajax.php

Simple merge
Simple merge