merge from trunk

author Christos Tsantilas <chtsanti@users.sourceforge.net>

Thu, 29 May 2014 17:40:02 +0000 (20:40 +0300)

committer Christos Tsantilas <chtsanti@users.sourceforge.net>

Thu, 29 May 2014 17:40:02 +0000 (20:40 +0300)
author Christos Tsantilas <chtsanti@users.sourceforge.net>
Thu, 29 May 2014 17:40:02 +0000 (20:40 +0300)
committer Christos Tsantilas <chtsanti@users.sourceforge.net>
Thu, 29 May 2014 17:40:02 +0000 (20:40 +0300)
diff --cc src/FwdState.cc
Simple merge
diff --cc src/Makefile.am
Simple merge
diff --cc src/Server.cc
Simple merge
diff --cc src/cache_cf.cc
Simple merge
diff --cc src/cf.data.pre
Simple merge
diff --cc src/client_side.cc
Simple merge
diff --cc src/ftp.cc
Simple merge
diff --cc src/main.cc
Simple merge
author	Christos Tsantilas <chtsanti@users.sourceforge.net>
	Thu, 29 May 2014 17:40:02 +0000 (20:40 +0300)
committer	Christos Tsantilas <chtsanti@users.sourceforge.net>
	Thu, 29 May 2014 17:40:02 +0000 (20:40 +0300)
		1	2
src/FwdState.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/Server.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/cache_cf.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/cf.data.pre	patch \|	diff1 \|	diff2 \|	blob \| history
src/client_side.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/ftp.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/main.cc	patch \|	diff1 \|	diff2 \|	blob \| history