Merge branch 'master' of https://g.iterate.ch/scm/iterate/cyberduck
commitff34d6de906e27c62241441da20c7143da6a4171
authordkocher <dkocher>
Mon, 26 Oct 2015 13:17:28 +0000 (26 13:17 +0000)
committerdkocher <dkocher>
Mon, 26 Oct 2015 13:17:28 +0000 (26 13:17 +0000)
tree0c909514ff14ca9510756570f97c35e085c9cd78
parent759423854a1bbd6fa9fd2d964785f67aa0ed43ee
Merge branch 'master' of https://g.iterate.ch/scm/iterate/cyberduck

git-svn-id: https://svn.cyberduck.io/trunk@18420 9e2dff1d-8f06-0410-b5b1-4d70b6340adc