Merge branch 'MDL-48889-master' of git://github.com/jethac/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Feb 2015 00:36:27 +0000 (01:36 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Feb 2015 00:36:27 +0000 (01:36 +0100)
1  2 
repository/s3/lib.php

Simple merge