[fpaste-server/el6: 4/4] fixing merge conflicts for v0.2

[Clint Savage]

commit 33fe6a80e8e436e0d9f027a6d6b52806741a521d
Merge: 4de96f9 5dae88c
Author: Clint Savage <herlo1 at gmail.com>
Date:   Wed Aug 10 14:36:17 2011 -0600

    fixing merge conflicts for v0.2

 .gitignore         |    2 +-
 fpaste-server.spec |   17 ++++++++++-------
 sources            |    2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)
---
diff --cc .gitignore
index b40cf78,421f2a1..edd77d5
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--/fpaste-server-0.1.tar.gz
+ /fpaste-server-0.2.tar.gz