Merge branch 'topic/pr-934' into develop

James Moger

2015-10-05 4e54686d9346dc33a1cffd4a06c5c4ff9945f25e

 src/main/java/com/gitblit/transport/ssh/SshDaemonClient.java

@@ -17,7 +17,7 @@

import java.net.SocketAddress;

import org.apache.sshd.common.Session.AttributeKey;
import org.apache.sshd.common.session.Session.AttributeKey;

import com.gitblit.models.UserModel;