[python-fedora: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-fedora

[Toshio くらとみ]

commit e8e2bb6b95e726c75cbb357b6b9d57db44be2433
Merge: 8a6a54d 92fc277
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Tue Feb 5 09:31:15 2013 -0800

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-fedora
    
    Conflicts:
    	python-fedora.spec

 .gitignore         |    1 +
 python-fedora.spec |    5 ++++-
 sources            |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 46eeecd,2a289b7..566ba0f
--- a/.gitignore
+++ b/.gitignore
@@@ -9,4 -9,3 +9,5 @@@
  /python-fedora-0.3.30.tar.gz
  /python-fedora-0.3.31.tar.gz
  /python-fedora-0.3.32.1.tar.gz
 +/python-fedora-0.3.32.2.tar.gz
++/python-fedora-0.3.32.3.tar.gz
diff --cc python-fedora.spec
index cc34b59,3b8993d..beec2f5
--- a/python-fedora.spec
+++ b/python-fedora.spec
@@@ -3,8 -3,8 +3,8 @@@
  #%%global prerel c2
  
  Name:           python-fedora
- Version:        0.3.32.2
 -Version:        0.3.32.1
 -Release:        2%{?dist}
++Version:        0.3.32.3
 +Release:        1%{?dist}
  Summary:        Python modules for talking to Fedora Infrastructure Services
  
  Group:          Development/Languages
@@@ -162,8 -164,8 +162,11 @@@ rm -rf %{buildroot
  %{python_sitelib}/flask_fas.py*
  
  %changelog
 -* Fri Feb 01 2013 Adam Jackson <ajax at redhat.com> 0.3.32.1-2
 -- fix-updates-testing-tag.patch: Fix 'bodhi -T'
++* Tue Feb  5 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.32.3-1
++- Upstream update to fix BodhiClient's knowledge of koji tags (ajax)
++
 +* Mon Feb 04 2013 Toshio Kuratomi <toshio at fedoraproject.org> 0.3.32.2-1
 +- Upstream update fixing a bug interacting with python-requests
  
  * Thu Jan 24 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.32.1-1
  - Fix a documentation bug that slipped through
diff --cc sources
index b847365,997f150..7b5da48
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,1 @@@
- 73dd3625a2d94577167fe71ee0f3d431  python-fedora-0.3.32.2.tar.gz
 -0b3bb3a2d2683971be3a9c345c8dd00e  python-fedora-0.3.32.1.tar.gz
++a1d23925e00efdb2eaa8827b28211b71  python-fedora-0.3.32.3.tar.gz