Merge branch 'master' of https://scm.osdn.jp/gitroot/ultramonkey-l7/ultramonkey-l7...

Conflicts:
	l7vsd/src/tcp_session.cpp

diff --cc configure.in
index 71f4da6,f4289b6..f87acc8
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -1,9 -1,9 +1,9 @@@
  AC_PREREQ(2.59)
 -AC_INIT(l7vsd)
 +AC_INIT(l7vsd, 3.1.1, ultramonkey-l7-develop@lists.sourceforge.jp)
  PACKAGENAME=l7vsd
- VERSION=3.1.1
+ VERSION=3.1.2
  
 -AM_INIT_AUTOMAKE($PACKAGENAME, $VERSION, no-define )
 +AM_INIT_AUTOMAKE
  AC_CONFIG_SRCDIR([config.h.in])
  AC_CONFIG_HEADER([config.h])