[fence-agents/f20: 2/2] Merge branch 'master' into f20

[Marek Grác]

commit bab527258420d6a2f0b3a2e112a2b185ad9171b2
Merge: cdab24e 88a040b
Author: Marek 'marx' Grac <mgrac at redhat.com>
Date:   Mon Apr 7 14:05:57 2014 +0200

    Merge branch 'master' into f20
    
    Conflicts:
    	fence-agents.spec

 .gitignore                                         |    1 +
 ...uild-Remove-nss-nspr-checks-from-autoconf.patch |   27 --
 0002-autoconf_rebuild.patch                        |  441 --------------------
 fence-agents.spec                                  |   35 +-
 sources                                            |    2 +-
 5 files changed, 22 insertions(+), 484 deletions(-)
---
diff --cc fence-agents.spec
index 712c266,0e6a882..85b5877
--- a/fence-agents.spec
+++ b/fence-agents.spec
@@@ -579,9 -552,10 +580,13 @@@ The fence-agents-wti package contains 
  %{_mandir}/man8/fence_wti.8*
  
  %changelog
+ * Mon Apr 07 2014 Marek Grac <mgrac at redhat.com> - 4.0.8-1
+ - new upstream release
+ - new package fence-agents-raritan
+ 
 +* Wed Feb 26 2014 Marek Grac <mgrac at redhat.com> - 4.0.7-3
 +- requires a specific version of fence-agents-common
 +
  * Mon Feb 17 2014 Marek Grac <mgrac at redhat.com> - 4.0.7-2
  - new upstream release
  - changed dependancy from nss/nspr to gnutls-utils