Merge branch 'MDL-41907' of https://github.com/merrill-oakland/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 24 Sep 2013 22:18:30 +0000 (10:18 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 24 Sep 2013 22:18:30 +0000 (10:18 +1200)
1  2 
repository/lib.php

Simple merge