]> source.dussan.org Git - jgit.git/commitdiff
Merge branch 'stable-4.9' 85/113285/1
authorDavid Pursehouse <david.pursehouse@gmail.com>
Wed, 13 Dec 2017 00:51:44 +0000 (09:51 +0900)
committerDavid Pursehouse <david.pursehouse@gmail.com>
Wed, 13 Dec 2017 00:51:57 +0000 (09:51 +0900)
* stable-4.9:
  TransportCommand#setTimeout: Specify units for timeout in Javadoc
  Fix typo in key of a JGitText externalized string

Change-Id: Icb60537d2e99cb6e928d9fe07f66695ed69081b5
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>

Trivial merge