Merge branch '2923_sftp_aliases'
commita3b96d69f15c568d179a4723a84d3ecb51208f80
authorSlava Zanko <slavazanko@gmail.com>
Tue, 18 Jun 2013 09:53:28 +0000 (18 12:53 +0300)
committerSlava Zanko <slavazanko@gmail.com>
Tue, 18 Jun 2013 09:53:28 +0000 (18 12:53 +0300)
treec1918e3e5365e1df45090e93c6933bf865ccfc0a
parent97e37308b94b55796f25a2927d393b5319607810
parentfc34675093fbb0a4f49deb2c4e2449c9fb029375
Merge branch '2923_sftp_aliases'

* 2923_sftp_aliases:
  src/vfs/sftpfs/vfs_subclass.c: add missing includes.
  Fix: sftp: password ask too often if hostname was bring from ~/.ssh/config file
  Ticket #2923: broken aliases in SFTPFS.