Merge remote-tracking branch 'remotes/origin2/master'

diff --cc git_graph.php
index f389476c07209b7643983ca60fdb634a77abbae3,42f4813d263160db5fa4cacd9fe58673627928c6..5f660a02d38f72942eb36cc4fcd3202c556bb65a
--- 1/git_graph.php
--- 2/git_graph.php
+++ b/git_graph.php
@@@ -1,15 -1,11 +1,16 @@@
  <?php
  
  /* CONFIG */
 +<<<<<<< HEAD
 +$repo_path = "/home/git/";
 +$project_list = null;
 +=======
  $repo_path = "/srv/gitosis/repositories/";
  $project_list = "/srv/gitosis/gitosis/projects.list";
 +>>>>>>> remotes/origin2/master
  
  $size = 20;
+ $header_height = false; //false = dynamic
  $tile_size = 20; /* do not edit */
  
  $max_branches = 30;