Merge branch 'wip-MDL-33777-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Jun 2012 08:18:27 +0000 (16:18 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 25 Jun 2012 08:18:27 +0000 (16:18 +0800)
1  2 
repository/equella/lib.php

Simple merge