[libntlm/epel7: 5/6] Merge remote-tracking branch 'centos/c7' into epel7

[Till Maas]

commit 4fc5923a6723fe3b23d3d0a3cc61559b92fc43b0
Merge: 6a380ad b907a73
Author: Till Maas <opensource at till.name>
Date:   Tue Jul 1 14:03:34 2014 +0200

    Merge remote-tracking branch 'centos/c7' into epel7
    
    Conflicts:
    	.gitignore

 .gitignore   |    2 --
 libntlm.spec |   57 +++++++++++++++++++++++++++++++++++++--------------------
 sources      |    2 +-
 3 files changed, 38 insertions(+), 23 deletions(-)
---
diff --cc .gitignore
index 37dc8fb,6fb884b..ac6a8cd
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,1 +1,1 @@@
- libntlm-1.2.tar.gz
 -SOURCES/libntlm-1.3.tar.gz
 +/libntlm-1.3.tar.gz
- /libntlm-1.4.tar.gz
diff --cc sources
index 92d127d,0000000..785db93
mode 100644,000000..100644
--- a/sources
+++ b/sources
@@@ -1,1 -1,0 +1,1 @@@
- 54793488450e9085c57e0d859ff3bc8c  libntlm-1.4.tar.gz
++fd2419e4d1b7b70244c56c285e2a37a0  libntlm-1.3.tar.gz