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)
commit6100b006f18f08f0ac6be6710c7e829104411be1
tree5dfd5541c1706a1d89ba939d23b7e8eaa60b3016
parentb0d316293034011723283a521dcacaa02f3dc36f
parentc01f7628f790c3d7e26f8aa9070dad88b29e14f7
Merge branch 'wip-MDL-33777-master' of git://github.com/marinaglancy/moodle
repository/equella/lib.php