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

[Matthias Runge]

commit 5dcdc7261555968e94107b66eb7d7247153d7357
Merge: 9ef2fc6 e91e1da
Author: Matthias Runge <mrunge at redhat.com>
Date:   Wed Mar 6 11:28:02 2013 +0100

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

 python-django-appconf.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc python-django-appconf.spec
index dfff392,bb8ae6c..656de7c
--- a/python-django-appconf.spec
+++ b/python-django-appconf.spec
@@@ -53,9 -50,9 +53,12 @@@ rm -rf html/.{doctrees,buildinfo
  %{python_sitelib}/django_appconf-%{version}-py?.?.egg-info
  
  %changelog
 +* Wed Mar 06 2013 Matthias Runge <mrunge at redhat.com> - 0.6-1
 +- update to appconf-0.6
 +
+ * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
  * Wed Sep 26 2012 Matthias Runge <mrunge at redhat.com> - 0.5-2
  - also add requirement: Django/python-django