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

Conflicts:
	git_graph.php

diff --cc git_graph.php
index a25bc8dbd29d65804899955969637ff5d0828bbb,ce55b1e7789f3f44f7605a388d3a1f34d6430961..f389476c07209b7643983ca60fdb634a77abbae3
--- 1/git_graph.php
--- 2/git_graph.php
+++ b/git_graph.php
@@@ -1,8 -1,8 +1,13 @@@
  <?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;
  $tile_size = 20; /* do not edit */