[python-djblets/el6: 2/2] Merge branch 'master' into el6

[Stephen Gallagher]

commit b97d74812f61ed11a43b16aec82dcdc623fad1d4
Merge: 5130ba5 65bb056
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Mon Apr 22 09:00:28 2013 -0400

    Merge branch 'master' into el6
    
    Conflicts:
    	python-djblets.spec

 .gitignore          |    1 +
 python-djblets.spec |   43 +++++++++++++++++++++++++++++--------------
 sources             |    2 +-
 3 files changed, 31 insertions(+), 15 deletions(-)
---
diff --cc python-djblets.spec
index 1d1b93e,0705837..f222a22
--- a/python-djblets.spec
+++ b/python-djblets.spec
@@@ -21,22 -21,19 +21,19 @@@ BuildArch:      noarc
  BuildRequires:  python
  BuildRequires:  python-devel
  BuildRequires:  python-setuptools
- BuildRequires:  python-django-pipeline
- %if 0%{?fedora} > 17
- BuildRequires:  python-django14
- Requires:       python-django >= 1.4.5
- Conflicts:      python-django >= 1.5
- %else
- BuildRequires:  Django14
- Requires:       Django >= 1.4.5
- Conflicts:      Django >= 1.5
- %endif
+ BuildRequires:  python-django-pipeline >= 1.2.24
+ 
  Requires:       python-imaging
  Requires:       pytz
 -Requires:       python-feedparser >= 5.1.2
 +Requires:       python-feedparser
- Requires:       python-django-pipeline >= 1.2.16
+ Requires:       python-django-pipeline >= 1.2.24
  Conflicts:      python-django-pipeline >= 1.3.0
  
+ # Distro-release-specific
+ # Change this for each branch
 -BuildRequires:  python-django14
 -Requires:       python-django14
++BuildRequires:  Django14
++Requires:       Django14
+ 
  %description
  A collection of useful classes and functions for Django
  
@@@ -73,8 -69,28 +70,26 @@@ rm -rf $RPM_BUILD_ROO
  %{python_sitelib}/djblets/
  
  %changelog
+ * Mon Apr 22 2013 Stephen Gallagher <sgallagh at redhat.com> - 0.7.12-1
+ - New upstream release 0.7.12
+ - djblets.datagrid:
+     * Massively speed up datagrid rendering
+ - djblets.extensions:
+     * Added an install_extension function to ExtensionManager
+ - djblets.util.fields:
+     * CounterField now allows incrementing/decrementing by values other than 1
+ - djblets.util.templatetags:
+     * The thumbnail and crop_image template tags now work with Django Storage
+       backends
+     * Added a save_image_to_storage function in djblets_images that makes it
+       easy to save image data to Storage backends
+ - djblets.webapi:
+     * Resources now consider both Last Modified and ETag headers simultaneously
+       when determining if a cached payload is still valid. Previously, if the
+       Last Modified timestamps were the same, the ETag check would fail
+ 
  * Wed Apr 10 2013 Stephen Gallagher <sgallagh at redhat.com> - 0.7.11-2
  - Guarantee that Djblets builds against the correct version of Django
 -
 -* Thu Feb 21 2013 Stephen Gallagher <sgallagh at redhat.com> - 0.7.11-1
  - New upstream release 0.7.11
  - djblets.util.fields:
      * CounterField was failing to use the initializers for brand new