Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

 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;