[pacemaker/f21: 3/3] Merge branch 'f20' into f21

[Andrew Beekhof]

commit 362ab4aa76a7f52f78832f067bdc494d5638f424
Merge: db7c0c1 f93fe34
Author: Andrew Beekhof <andrew at beekhof.net>
Date:   Tue Oct 28 18:39:55 2014 +1100

    Merge branch 'f20' into f21
    
    Conflicts:
    	.gitignore
    	pacemaker.spec
    	sources

 .gitignore     |    1 +
 pacemaker.spec |  536 ++------------------------------------------------------
 sources        |    2 +-
 3 files changed, 17 insertions(+), 522 deletions(-)
---
diff --cc pacemaker.spec
index b7829d7,840b30e..400007c
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@@ -512,12 -511,10 +511,16 @@@ exit 
  %doc AUTHORS
  
  %changelog
+ * Tue Oct 28 2014 Andrew Beekhof <abeekhof at redhat.com> - 1.1.12-1
+ - Update for new upstream tarball: Pacemaker-1.1.12+ (a9c8177)
+ - See included ChangeLog file or https://raw.github.com/ClusterLabs/pacemaker/master/ChangeLog for full details
+ 
 +* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.11-1.2
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 +
 +* Fri Jun 06 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.11-1.1
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 +
  * Tue Feb 18 2014 Andrew Beekhof <abeekhof at redhat.com> - 1.1.11-1
  - Update for new upstream tarball: Pacemaker-1.1.11 (9d39a6b)
  - See included ChangeLog file or https://raw.github.com/ClusterLabs/pacemaker/master/ChangeLog for full details