Shawn Pearce e4893eb0ff Merge branch 'stable-2.6' into stable-2.7 ...

* stable-2.6:
  Bump SSHD version to 0.9.0.201311081

Conflicts:
	gerrit-sshd/src/main/java/com/google/gerrit/sshd/DatabasePubKeyAuth.java
	gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java

Change-Id: Iacee71305c167687c8f70836bff802b1dfec2082

2013-11-08 20:56:49 -08:00

..

.settings

Remove timestamp from all org.eclipse.core.resources.prefs files.

2012-07-04 14:06:09 +02:00

src/main

Bump SSHD version to 0.9.0.201311081

2013-11-09 05:45:19 +01:00

.gitignore

Add Intellij IDEA files to ignore list

2012-05-03 13:17:43 -07:00

pom.xml

Set version to 2.7

2013-09-18 13:05:11 -07:00