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)
commitbfee251334b2aa485780edd4e41bb7e800f1a99a
treee30f0954e6707557edfe57e6df3757df14d88c5f
parentcc1521f57b94110f5a3b2c113fa5fe1ad2abbcc6
parent82b287522edcaaba734ae4820468ce07fef8ab3d
Merge branch 'MDL-33669' of git://github.com/equella/moodle
repository/equella/lib.php