svn export http://svn.svnkit.com/repos/3rdparty/com.trilead.ssh2/tags/1.0.0-build217/trilead-ssh2/src/main/java/
Merge branch 'upstream' into merge

Conflicts:
	src/com/trilead/ssh2/Connection.java
	src/com/trilead/ssh2/KnownHosts.java
	src/com/trilead/ssh2/SFTPv3Client.java
	src/com/trilead/ssh2/Session.java
	src/com/trilead/ssh2/StreamGobbler.java
	src/com/trilead/ssh2/auth/AuthenticationManager.java
	src/com/trilead/ssh2/channel/Channel.java
	src/com/trilead/ssh2/channel/ChannelManager.java
	src/com/trilead/ssh2/channel/LocalAcceptThread.java
	src/com/trilead/ssh2/channel/RemoteAcceptThread.java
	src/com/trilead/ssh2/channel/RemoteX11AcceptThread.java
	src/com/trilead/ssh2/channel/StreamForwarder.java
	src/com/trilead/ssh2/signature/DSASHA1Verify.java
	src/com/trilead/ssh2/signature/RSAPrivateKey.java
	src/com/trilead/ssh2/transport/ClientServerHello.java
	src/com/trilead/ssh2/transport/KexManager.java
	src/com/trilead/ssh2/transport/TransportConnection.java
	src/com/trilead/ssh2/transport/TransportManager.java
[maven-release-plugin] prepare release trilead-ssh2-build217-jenkins-2
[maven-release-plugin] prepare for next development iteration
move source to /src
Merge branch 'merge'

Conflicts:
	pom.xml
	src/com/trilead/ssh2/Connection.java
	src/com/trilead/ssh2/SFTPv3Client.java
	src/com/trilead/ssh2/auth/AuthenticationManager.java
	src/com/trilead/ssh2/channel/ChannelManager.java
	src/com/trilead/ssh2/channel/StreamForwarder.java
	src/com/trilead/ssh2/signature/RSAPrivateKey.java