]> source.dussan.org Git - jgit.git/commit
Merge branch 'stable-4.9' 96/110496/1
authorDavid Pursehouse <david.pursehouse@gmail.com>
Mon, 23 Oct 2017 03:08:54 +0000 (12:08 +0900)
committerDavid Pursehouse <david.pursehouse@gmail.com>
Mon, 23 Oct 2017 03:08:59 +0000 (12:08 +0900)
commitf89101105e489903a4e5a483a478122fecf97f06
treee665ff9ee1f0243c55efbf75965bdcdaf918da2b
parent7cd5d77ae37ad7febb6d6e7410da4e7b35348fce
parente1a39cbbe7c9f317b5f9ff6f4b7792eb2b837a09
Merge branch 'stable-4.9'

* stable-4.9:
  Avoid bad rounding "1 year, 12 months" in date formatter
  Ensure that ~ in ssh config is replaced before Jsch sees it

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