[askbot: 3/3] Merge branch 'master' of ssh://pkgs.fedoraproject.org/askbot

[Ralph Bean ☃]

commit f97056ab8e503c607d7d211a43e7941fb9d9b4e7
Merge: 3ed0db2 f3ca82a
Author: Ralph Bean <rbean at redhat.com>
Date:   Mon Feb 25 11:47:40 2013 -0500

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/askbot
    
    Conflicts:
    	askbot.spec

 askbot.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc askbot.spec
index f247091,f77ce31..259f5eb
--- a/askbot.spec
+++ b/askbot.spec
@@@ -253,34 -149,9 +253,37 @@@ chown -R apache:apache %{_localstatedir
  %{python_sitelib}/askbot*.egg-info
  
  %changelog
 +* Tue Feb 12 2013 Ralph Bean <rbean at redhat.com> 0.7.48-8
 +- Conditionalized pystache patch for el6
 +- Disabled preun section.
 +
 +* Tue Feb 05 2013 Ralph Bean <rbean at redhat.com> 0.7.48-6
 +- Conditionalized python-django* requires for el6
 +- Patched some problems with askbot/startup_procedures.py
 +- Updated settings.py with new needed parameters.
 +- Added a commented %%post section with db upgrade path.
 +- Fixed WSGI sys.stdout errors.
 +
 +* Mon Feb 04 2013 Ralph Bean <rbean at redhat.com> 0.7.48-4
 +- Added django-longerusername as a requirement
 +- Added django-tinymce as a requirement
 +- Added pytz as a requirement
 +- Added python-sanction as a requirement
 +- Added python-lamson as a requirement
 +
 +* Mon Feb 04 2013 Kevin Fenzi <kevin at scrye.com> 0.7.48-1
 +- Update to 0.7.48
 +
 +* Wed Jan 23 2013 Kevin Fenzi <kevin at scrye.com> 0.7.47-1
 +- Update to 0.7.47.
 +
 +* Tue Dec 04 2012 Kevin Fenzi <kevin at scrye.com> 0.7.44-1
 +- Update to 0.7.44.
 +- See http://askbot.org/doc/changelog.html for full changes.
 +
+ * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.40-6
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
  * Wed Aug 22 2012 Parag Nemade <paragn AT fedoraproject DOT org> - 0.7.40-5
  - Hardcoding versioned Requires is not recommended