[python-webob: 11/12] Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-webob1.2

[Luke Macken]

commit 412af48754fed30056357ce8a077a85ca58bcf49
Merge: ea0c258 e994013
Author: Luke Macken <lmacken at redhat.com>
Date:   Wed Mar 27 19:45:18 2013 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-webob1.2
    
    Conflicts:
    	.gitignore
    	sources

 .gitignore                          |    7 +-
 README.Fedora                       |   12 ++
 python-webob1.2.spec                |  227 +++++++++++++++++++++++++++++++++++
 sources                             |    2 +-
 webob-1.2.3-test-headers2-fix.patch |   25 ++++
 5 files changed, 266 insertions(+), 7 deletions(-)
---
diff --cc .gitignore
index 96732b4,334d6d7..fb84c78
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,2 +1,1 @@@
- WebOb-0.9.8.tar.gz
- /WebOb-1.0.tar.gz
- WebOb-1.0.3.tar.gz
- /WebOb-1.0.5.zip
- /WebOb-1.0.8.zip
- /WebOb-1.1.1.zip
 -/WebOb-1.2.1.zip
+ /WebOb-1.2.3.tar.gz