[pcs/f17: 3/3] Merge from master

[cfeist]

commit 60f0662bf7bf520ba4c74b8b6058cc74acea5ece
Merge: ebab0ab 802cd98
Author: Chris Feist <cfeist at redhat.com>
Date:   Wed Aug 8 09:45:53 2012 -0500

    Merge from master

 .gitignore |    4 ++++
 pcs.spec   |    9 +++++++--
 sources    |    2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index def6ad9,a13f4d6..9657344
--- a/.gitignore
+++ b/.gitignore
@@@ -5,4 -5,4 +5,8 @@@
  /pcs-0.9.3.linux-x86_64.tar.gz
  /pcs-0.9.3.1.linux-x86_64.tar.gz
  /pcs-0.9.3.1.tar.gz
++<<<<<<< HEAD
 +/pcs-0.9.4.tar.gz
++=======
+ /pcs-0.9.12.tar.gz
++>>>>>>> origin/master
diff --cc pcs.spec
index f8b304c,1c07a8e..0983222
--- a/pcs.spec
+++ b/pcs.spec
@@@ -38,10 -38,12 +38,16 @@@ chmod 755 $RPM_BUILD_ROOT/%{python_site
  %doc COPYING README
  
  %changelog
+ * Tue Aug 07 2012 Chris Feist <cfeist at redhat.com> - 0.9.12-1
+ - Resync to latest version of pcs
+ 
 +* Thu May 24 2012 Chris Feist <cfeist at redhat.com> - 0.9.4-1
 +- Resync to latest version of pcs
 +- Move cluster creation options to cluster sub command.
 +
+ * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.3.1-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Mon May 07 2012 Chris Feist <cfeist at redhat.com> - 0.9.3.1-1
  - Resync to latest version of pcs which includes fixes to work with F17.