[fuse-sshfs/el6: 3/3] Merge branch 'master' into el6

[Peter Lemenkov]

commit 99702e2b80bb5891ea8ad0c54306b7ae1fa2a353
Merge: 74789e4 05a6680
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Apr 19 22:21:43 2012 +0400

    Merge branch 'master' into el6

 .gitignore      |    1 +
 fuse-sshfs.spec |    8 +++++++-
 sources         |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---