Merge

diff --cc Makefile.PL
Simple merge

diff --cc lib/Gitalist/Model/Git.pm
index 48c2d0c,1231ba0..9e824f2
--- 1/lib/Gitalist/Model/Git.pm
--- 2/lib/Gitalist/Model/Git.pm
+++ b/lib/Gitalist/Model/Git.pm
@@@ -379,9 -380,9 +379,9 @@@ Return the contents of a given file
  =cut
  
  sub cat_file {
 -  my ($self, $object) = @_;
 +  my ($self, $object, $project) = @_;
  
-   my $type = $self->get_object_type($object, $project);
+   my $type = $self->get_object_type($object, $self->project);
    die "object `$object' is not a file\n"
      if (!defined $type || $type ne 'blob');