From: Andreas Eversberg <jolly@eversberg.eu>
Date: Tue, 27 Oct 2009 06:56:59 +0000 (+0100)
Subject: Merge branch 'master' of ssh://jolly@www.mISDN.org/var/git/lcr
X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=commitdiff_plain;h=8994874d7bcb1eff9ee833fb22e4910cc365f456;hp=-c

Merge branch 'master' of ssh://jolly@mISDN.org/var/git/lcr

Conflicts:
	README
---

8994874d7bcb1eff9ee833fb22e4910cc365f456
diff --combined README
index f423b62,c7cac53..8c0d65a
--- a/README
+++ b/README
@@@ -520,7 -520,6 +520,7 @@@ Changes after Version 1.
   -> Just add 'extern' right below your external interface definition, or give
      external interface name in routing.conf: ": extern interfaces=XXXXX"
  - Added experimental CCITT No. 5 signalling system. (for educational purpose)
+ - Added socket owner/group options to options.conf
 +- Fixed/simplyfied config parser. The last digit of the last line was ignored.
  
  
-