Merge branch 'MDL-33669' of git://github.com/equella/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 05:13:53 +0000 (13:13 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 05:13:53 +0000 (13:13 +0800)
1  2 
repository/equella/lib.php

Simple merge