[python-django-openstack-auth/el6-havana: 2/2] Merge branch 'master' into el6-havana

[Matthias Runge]

commit 0e7f699631120d91315d01a838ba288137acad79
Merge: 1408ddd 82eab98
Author: Matthias Runge <mrunge at redhat.com>
Date:   Thu Dec 12 13:46:10 2013 +0100

    Merge branch 'master' into el6-havana
    
    Conflicts:
    	python-django-openstack-auth.spec

 .gitignore                        |    1 +
 python-django-openstack-auth.spec |   26 ++++++++++++++++----------
 sources                           |    2 +-
 3 files changed, 18 insertions(+), 11 deletions(-)
---
diff --cc python-django-openstack-auth.spec
index 44fb33a,e0d3ad8..99a5c21
--- a/python-django-openstack-auth.spec
+++ b/python-django-openstack-auth.spec
@@@ -95,8 -101,8 +101,8 @@@ rm -rf %{buildroot}/%{python_sitelib}/o
  %{python_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
  
  %changelog
- * Mon Dec 02 2013 Matthias Runge <mrungełredhat.com> - 1.1.2-2
- - bump version to revive
 -* Fri Oct 11 2013 Matthias Runge <mrunge at redhat.com> - 1.1.3-1
 -- update to stable version 1.1.3 (rhbz#1014494)
++* Thu Dec 12 2013 Matthias Runge <mrunge at redhat.com> - 1.1.3-1
++- update to stable version 1.1.3 for icehouse
  
  * Tue Sep 10 2013 Matthias Runge <mrunge at redhat.com> - 1.1.2-1
  - update to stable version 1.1.2 (rhbz#1006012)