[libssh/f17: 2/2] Merge branch 'master' into f17

[Simone Caronni]

commit cd348e5001c61cc99a76ed0320b2b2282a49faf8
Merge: 7df820f aa5810c
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Fri Jul 26 11:48:41 2013 +0200

    Merge branch 'master' into f17

 .gitignore                                     |    2 +
 libssh-0.5.4-channel-close.patch               |   33 ------------
 libssh-0.5.4-disable-latex-documentation.patch |   58 ++++++++++++++++++++-
 libssh-0.5.4-fix-typo.patch                    |   14 -----
 libssh.spec                                    |   65 ++++++++++++++----------
 sources                                        |    4 +-
 6 files changed, 97 insertions(+), 79 deletions(-)
---