From: pk910 <philipp@zoelle1.de>
Date: Wed, 22 Aug 2012 01:29:22 +0000 (+0200)
Subject: Merge branch 'master' into IOMultiplexer
X-Git-Tag: v5.5~9^2~7
X-Git-Url: http://git.pk910.de/?a=commitdiff_plain;h=f844b726b55c5508e31579073121c38317ecd968;hp=1dce2c7b12c45bf3781a28be649c0ed6c1265801;p=NeonServV5.git

Merge branch 'master' into IOMultiplexer
---

diff --git a/src/version.sh b/src/version.sh
index 27b7589..a7c712f 100644
--- a/src/version.sh
+++ b/src/version.sh
@@ -26,7 +26,7 @@ if test "x$git_revision" = "x" ; then
   git_commitcount="0"
 else
   git_commitcount=`git rev-list --oneline --header master | wc -l | sed "s/[ \t]//g"`
-  git_revision="git-$git_commitcount-$svn_revision"
+  git_revision="git-$git_commitcount-$git_revision"
 fi