From 60f0662bf7bf520ba4c74b8b6058cc74acea5ece Mon Sep 17 00:00:00 2001
From: Chris Feist <cfeist@redhat.com>
Date: Aug 08 2012 14:45:53 +0000
Subject: Merge from master


---

diff --git a/.gitignore b/.gitignore
index def6ad9..9657344 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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 --git a/pcs.spec b/pcs.spec
index f8b304c..0983222 100644
--- a/pcs.spec
+++ b/pcs.spec
@@ -1,5 +1,5 @@
 Name: pcs		
-Version: 0.9.4
+Version: 0.9.12
 Release: 1%{?dist}
 License: GPLv2
 URL: http://github.com/feist/pcs
@@ -38,10 +38,16 @@ chmod 755 $RPM_BUILD_ROOT/%{python_sitelib}/pcs/pcs.py
 %doc COPYING README
 
 %changelog
+* Tue Aug 07 2012 Chris Feist <cfeist@redhat.com> - 0.9.12-1
+- Resync to latest version of pcs
+
 * Thu May 24 2012 Chris Feist <cfeist@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@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@redhat.com> - 0.9.3.1-1
 - Resync to latest version of pcs which includes fixes to work with F17.
 
@@ -56,4 +62,3 @@ chmod 755 $RPM_BUILD_ROOT/%{python_sitelib}/pcs/pcs.py
 
 * Mon Jan 16 2012 Chris Feist <cfeist@redhat.com> - 0.9.0-1
 - Initial Build
-
diff --git a/sources b/sources
index 9d1a597..f9aa068 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f40db755a4331da649c5735eb3b4ac02  pcs-0.9.4.tar.gz
+1c1b11b7835cdcda340eecbcc7a6fc3a  pcs-0.9.12.tar.gz