From: Stricted <Stricted@nexus-irc.de>
Date: Fri, 7 Sep 2012 18:41:28 +0000 (+0200)
Subject: Merge remote-tracking branch 'remotes/origin2/master'
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a33f8c96495ac8d74b1a93c8964386653034a25f;p=gitweb.git

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

Conflicts:
	git_graph.php
---

a33f8c96495ac8d74b1a93c8964386653034a25f
diff --cc git_graph.php
index a25bc8d,ce55b1e..f389476
--- a/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 */